From 5b7ba0c1446214ade3e9e16166b15e172b05cbeb Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 22 Nov 2017 10:40:43 +0630
Subject: [PATCH] update supervisor wrong spelling

---
 app/controllers/home_controller.rb          |  4 +--
 app/models/ability.rb                       |  2 +-
 app/views/layouts/login_dashboard.html.erb  |  2 +-
 app/views/origami/addorders/detail.html.erb |  2 +-
 app/views/origami/home/show.html.erb        | 16 +++++-----
 app/views/origami/rooms/show.html.erb       | 35 +++++++++++++++------
 6 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index bc621bd7..e0667a83 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -45,7 +45,7 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisour"
+      elsif @employee.role == "supervisor"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
       elsif @employee.role == "account"
@@ -151,7 +151,7 @@ class HomeController < ApplicationController
       redirect_to oqs_root_path
     elsif employee.role == "crm"
       redirect_to crm_root_path
-    elsif @employee.role == "supervisour"
+    elsif @employee.role == "supervisor"
         redirect_to origami_root_path
     elsif @employee.role == "account"
         redirect_to reports_dailysale_index_path
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 70ce4e94..c2947fe1 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -122,7 +122,7 @@ class Ability
         can :index, :credit_payment
         can :index, :void_sale
 
-    elsif user.role == "supervisour"
+    elsif user.role == "supervisor"
 
         can :edit, :sale_edit
         can :item_void, :sale_edit
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index d0d2cddd..7df224a3 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -85,7 +85,7 @@
 
                 <div class="row m-b-15">
                     <% @employees.each do |employee| %>
-                        <%if employee.role == "supervisour" %>
+                        <%if employee.role == "supervisor" %>
                             <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
                                 <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                 </form>
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2a6411a4..150ea55d 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -51,7 +51,7 @@
                      <th class="item-attr">Price</th>
                    </tr>
                  </thead>
-                 <tbody>
+                 <tbody class="font-13">
                  
                  </tbody>
                </table>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fc340d2c..0fd7fa89 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -143,7 +143,7 @@
                 <div class="row p-l-5 p-r-5">
                   <% if (!@sale_array.empty?) && (!@date.nil?) %>
                     <div class="col-lg-6 col-md-6 col-sm-6">
-                       Receipt No: <span id="receipt_no">
+                      &nbsp; Receipt No: <span id="receipt_no">
                          <% if @status_sale == 'sale' %>
                            <%= @sale_array[0].receipt_no rescue '' %>
 
@@ -152,12 +152,12 @@
                        <br>
                     </div>
                     <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
                       <br>
                     </div>
                   <% elsif !@date.nil? %>
-                    <div class="col-lg-6 col-md-6 col-sm-6">
-                       Order No: <span id="order_no">
+                    <div class="col-lg-7 col-md-7 col-sm-7">
+                      &nbsp; Order No: <span id="order_no">
                          <% if @status_order == 'order' %>
                            <%= @obj_order.order_id rescue '' %>
 
@@ -165,8 +165,8 @@
                        </span>
                        <br>
                     </div>
-                    <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+                    <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
                       <br>
                     </div>
                   <% end %>
@@ -176,11 +176,11 @@
                    
                       <% if @status_sale == 'sale' %>
                           <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
-                          Customer : <%= @sale_array[0].customer.name rescue '' %>
+                          &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
                       <% elsif @status_order == 'order'
                          %>
                           <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
-                          Customer : <%= @customer.name rescue "" %>
+                          &nbsp; Customer : <%= @customer.name rescue "" %>
                       <% end %>
                     
                 </div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index aaf7ad58..5e461650 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -137,26 +137,41 @@
        </div>
        <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">
-               <% if @status_sale == 'sale' %>
+           
+            <% if @status_sale == 'sale' %>
+            <div class="col-lg-6 col-md-6 col-sm-6">
+            &nbsp;  Receipt No: 
+              <span id="receipt_no">
                  <%= @obj_sale.receipt_no rescue '' %>
-
-               <% end %>
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+              </span>
+              </div>
+             <% else %>
+             <div class="col-lg-7 col-md-7 col-sm-7">
+             &nbsp; Order No: 
+              <span id="receipt_no">
+                 <%= @obj_order.order_id rescue '' %>
+              </span>
+              </div>
+            <% end %>
+           <% if @status_sale == 'sale' %>
+            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
             Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
            </div>
+             <% else %>
+               <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%></span>
+               </div>
+            <% end %>
+           
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5" >
            <div class="col-lg-6 col-md-6 col-sm-6">
              <% if @status_sale == 'sale' %>
               <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
-               Customer : <%= @obj_sale.customer.name rescue '-' %>
+              &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
              <%else%>
                <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
-               Customer : <%= @customer.name rescue "-" %>
+              &nbsp; Customer : <%= @customer.name rescue "-" %>
              <%end%>
            </div>