git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update supervisor wrong spelling

Browse Source
This commit is contained in:
Aung Myo
2017-11-22 10:40:43 +06:30
parent 749e271879
commit 5b7ba0c144
6 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/home_controller.rb
View File

@@ -45,7 +45,7 @@ class HomeController < ApplicationController
elsif @employee.role == "manager" elsif @employee.role == "manager"
session[:session_token] = @employee.token_session session[:session_token] = @employee.token_session
redirect_to dashboard_path redirect_to dashboard_path
elsif @employee.role == "supervisour" elsif @employee.role == "supervisor"
session[:session_token] = @employee.token_session session[:session_token] = @employee.token_session
redirect_to origami_root_path redirect_to origami_root_path
elsif @employee.role == "account" elsif @employee.role == "account"
@@ -151,7 +151,7 @@ class HomeController < ApplicationController
redirect_to oqs_root_path redirect_to oqs_root_path
elsif employee.role == "crm" elsif employee.role == "crm"
redirect_to crm_root_path redirect_to crm_root_path
elsif @employee.role == "supervisour" elsif @employee.role == "supervisor"
redirect_to origami_root_path redirect_to origami_root_path
elsif @employee.role == "account" elsif @employee.role == "account"
redirect_to reports_dailysale_index_path redirect_to reports_dailysale_index_path

2
app/models/ability.rb
View File

@@ -122,7 +122,7 @@ class Ability
can :index, :credit_payment can :index, :credit_payment
can :index, :void_sale can :index, :void_sale
elsif user.role == "supervisour" elsif user.role == "supervisor"
can :edit, :sale_edit can :edit, :sale_edit
can :item_void, :sale_edit can :item_void, :sale_edit

2
app/views/layouts/login_dashboard.html.erb
View File

@@ -85,7 +85,7 @@
<div class="row m-b-15"> <div class="row m-b-15">
<% @employees.each do |employee| %> <% @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 %>" > <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 id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
</form> </form>

2
app/views/origami/addorders/detail.html.erb
View File

@@ -51,7 +51,7 @@
<th class="item-attr">Price</th> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="font-13">
</tbody> </tbody>
</table> </table>

16
app/views/origami/home/show.html.erb
View File

@@ -143,7 +143,7 @@
<div class="row p-l-5 p-r-5"> <div class="row p-l-5 p-r-5">
<% if (!@sale_array.empty?) && (!@date.nil?) %> <% if (!@sale_array.empty?) && (!@date.nil?) %>
<div class="col-lg-6 col-md-6 col-sm-6"> <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' %> <% if @status_sale == 'sale' %>
<%= @sale_array[0].receipt_no rescue '' %> <%= @sale_array[0].receipt_no rescue '' %>
@@ -152,12 +152,12 @@
<br> <br>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <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> <br>
</div> </div>
<% elsif !@date.nil? %> <% elsif !@date.nil? %>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-7 col-md-7 col-sm-7">
Order No: <span id="order_no"> &nbsp; Order No: <span id="order_no">
<% if @status_order == 'order' %> <% if @status_order == 'order' %>
<%= @obj_order.order_id rescue '' %> <%= @obj_order.order_id rescue '' %>
@@ -165,8 +165,8 @@
</span> </span>
<br> <br>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <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 - %I:%M %p") rescue '-' %></span> Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
<br> <br>
</div> </div>
<% end %> <% end %>
@@ -176,11 +176,11 @@
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p> <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' <% elsif @status_order == 'order'
%> %>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
Customer : <%= @customer.name rescue "" %> &nbsp; Customer : <%= @customer.name rescue "" %>
<% end %> <% end %>
</div> </div>

35
app/views/origami/rooms/show.html.erb
View File

@@ -137,26 +137,41 @@
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title row p-l-5 p-r-5"> <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' %>
<%= @obj_sale.receipt_no rescue '' %>
<% end %> <% if @status_sale == 'sale' %>
</span> <div class="col-lg-6 col-md-6 col-sm-6">
</div> &nbsp; Receipt No:
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <span id="receipt_no">
<%= @obj_sale.receipt_no rescue '' %>
</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> Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
</div> </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>
<div class="card-title row customer_detail p-l-5 p-r-5" > <div class="card-title row customer_detail p-l-5 p-r-5" >
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p> <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%> <%else%>
<p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p> <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
Customer : <%= @customer.name rescue "-" %> &nbsp; Customer : <%= @customer.name rescue "-" %>
<%end%> <%end%>
</div> </div>