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

change dashboard query and report

Browse Source
This commit is contained in:
phyusin
2018-05-18 18:01:44 +06:30
parent f5604d8c9c
commit e1bb01c029
6 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/home/dashboard.html.erb
View File

@@ -119,7 +119,7 @@
<!-- Date range for dashboard -->
<div class="row">
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -176,9 +176,9 @@
</div>
</div>
<% end %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'cashier' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'cashier' %>
<% if !@summ_sale.nil? %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -249,12 +249,12 @@
</div>
</div>
</div>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
</div>
<% end %>
<% end %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<% else %>
@@ -298,11 +298,11 @@
</div>
<% end %>
</div>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
</div>
<% end %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<% else %>
@@ -349,7 +349,7 @@
</div>
</div>
</div>
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
</div>
<% end %>
<% end %>