From 24fd399c170b1b86b9a07a71c50c2430df40777d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 28 Jul 2017 11:30:35 +0630
Subject: [PATCH] update view

---
 .../transactions/manual_sales_controller.rb   |  1 +
 app/views/oqs/home/index.html.erb             |  2 +-
 app/views/origami/home/index.html.erb         |  9 ++++
 app/views/origami/home/show.html.erb          | 42 +++++++++----------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/controllers/transactions/manual_sales_controller.rb b/app/controllers/transactions/manual_sales_controller.rb
index 77dd4371..d7f26f39 100644
--- a/app/controllers/transactions/manual_sales_controller.rb
+++ b/app/controllers/transactions/manual_sales_controller.rb
@@ -3,6 +3,7 @@ class Transactions::ManualSalesController < ApplicationController
   def void
    @sale = params[:sale_id]   
    @reason = Lookup.where("lookup_type = 'void_reason'")
+
    respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 3e068b12..71077ec4 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -192,7 +192,7 @@
     <!-- OQS Buttons -->
     <button type="button" title="Print Order Item" id="print_order_item" class="btn btn-primary btn-lg btn-block">Print</a>
     <button type="button" class="btn btn-primary btn-lg btn-block" id="print_order_summary">Print <br/>Order<br/>Summary</button>
-    <a href="<%= dashboard_path %>" class="btn btn-primary btn-lg btn-block" role="button" aria-haspopup="true" aria-expanded="false"> Back </a>
+    <a href="<%= dashboard_path %>" class="btn btn-primary btn-lg btn-block" role="button" aria-haspopup="true"> Back </a>
     <!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
 
   </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 77d85f10..04c12262 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -110,6 +110,12 @@
    <!-- Temporary Disabled -->
    <!-- <button id="sale_summary" type="button" class="btn btn-block btn-primary">Sale Sammary</button> -->
    <button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier </button>
+
+   <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>  
+      <button id="back" type="button" class="btn btn-block btn-primary"><i class="fa fa-home fa-lg"></i> Back 
+      </button>
+   <%end%>
+  
  </div>
  </div>
  <!-- Column One -->
@@ -218,4 +224,7 @@ $('#cash_out').on('click',function(){
 $('#close_cashier').on('click',function(){
   window.location.href = '/origami/shift/close';
 })
+$('#back').on('click',function(){
+  window.location.href = '/dashboard';
+})
 </script>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 709ed7ca..891524ec 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -305,27 +305,27 @@
    <% if @dining.bookings.length >= 1 %>
    <button type="button" id="customer" class="btn btn-primary btn-block" >Customer</button>
 
-   <% if @status_order == 'order' && @status_sale != 'sale' %>
-     <!-- <button type="button" class="btn btn-primary btn-block" >Add Order</button> -->
-     <button type="button" class="btn btn-primary btn-block" disabled >Edit</button>
-     <button type="button" id="discount" class="btn btn-primary btn-block" disabled>Discount</button>
-     <button type="button" id="other-charges" class="btn btn-primary btn-block" disabled>Charges</button>
-     <button type="button" class="btn btn-primary btn-block" id='move'>Move</button>
-     <button type="button" id="request_bills" class="btn btn-primary btn-block">Req.Bill</button>
-     <button type="button" id="first_bill" class="btn btn-primary btn-block" disabled>First Bill</button>
-     <button type="button" id="pay" class="btn btn-primary btn-block" disabled>Pay</button>
-     <button type="button" class="btn btn-primary btn-block" disabled> Void </button>
-  <% else %>
-      <!-- <button type="button" class="btn btn-primary btn-block" disabled>Add Order</button> -->
-      <button type="button" class="btn btn-primary btn-block" id='edit'>Edit</button>
-      <button type="button" id="discount" class="btn btn-primary btn-block" >Discount</button>
-      <button type="button" id="other-charges" class="btn btn-primary btn-block" >Charges</button>
-      <button type="button" class="btn btn-primary btn-block" id='move' disabled="">Move</button>
-      <button type="button" id="request_bills" class="btn btn-primary btn-block" disabled> Req.Bill</button>
-      <button type="button" id="first_bill" class="btn btn-primary btn-block">First Bill</button>
-      <button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
-      <button type="button" id="void" class="btn btn-primary btn-block" > Void </button>
-   <% end %>
+     <% if @status_order == 'order' && @status_sale != 'sale' %>
+       <!-- <button type="button" class="btn btn-primary btn-block" >Add Order</button> -->
+       <button type="button" class="btn btn-primary btn-block" disabled >Edit</button>
+       <button type="button" id="discount" class="btn btn-primary btn-block" disabled>Discount</button>
+       <button type="button" id="other-charges" class="btn btn-primary btn-block" disabled>Charges</button>
+       <button type="button" class="btn btn-primary btn-block" id='move'>Move</button>
+       <button type="button" id="request_bills" class="btn btn-primary btn-block">Req.Bill</button>
+       <button type="button" id="first_bill" class="btn btn-primary btn-block" disabled>First Bill</button>
+       <button type="button" id="pay" class="btn btn-primary btn-block" disabled>Pay</button>
+       <button type="button" class="btn btn-primary btn-block" disabled> Void </button>
+    <% else %>
+        <!-- <button type="button" class="btn btn-primary btn-block" disabled>Add Order</button> -->
+        <button type="button" class="btn btn-primary btn-block" id='edit'>Edit</button>
+        <button type="button" id="discount" class="btn btn-primary btn-block" >Discount</button>
+        <button type="button" id="other-charges" class="btn btn-primary btn-block" >Charges</button>
+        <button type="button" class="btn btn-primary btn-block" id='move' disabled="">Move</button>
+        <button type="button" id="request_bills" class="btn btn-primary btn-block" disabled> Req.Bill</button>
+        <button type="button" id="first_bill" class="btn btn-primary btn-block">First Bill</button>
+        <button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
+        <button type="button" id="void" class="btn btn-primary btn-block" > Void </button>
+     <% end %>
    <!-- Cashier Buttons -->
 
    <!-- <button type="button" id="re-print" class="btn btn-primary btn-block" >Re.Print</button> -->