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

merge with august_spring

Browse Source
This commit is contained in:
Yan
2017-08-22 14:52:14 +06:30
parent c3e511c8ed 533cfdfe8d
commit 744065d3e9
102 changed files with 2910 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
<div class="col-md-12">
<div class="card" id="origami" onclick="location.href='<%= origami_root_path %>'">
<div class="card-content">
<span class="card-title">Origami</span>
<span class="card-title">Cashier</span>
</div>
</div>
</div>
@@ -66,8 +66,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#admin">Administrator
<span class="glyphicon glyphicon-plus"></span></a>
Administrator
</h4>
</div>
<div id="admin" class="panel-collapse collapse in">
@@ -105,7 +104,7 @@
</ul>
<ul class="col-md-4">
<li>OQS</li><br>
<li>Origami</li><br>
<li>Cashier</li><br>
<li>CRM</li>
</ul>
</div>
@@ -115,8 +114,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#manager">Manager
<span class="glyphicon glyphicon-plus"></span></a>
Manager
</h4>
</div>
<div id="admin" class="panel-collapse collapse in">
@@ -152,7 +150,7 @@
</ul>
<ul class="col-md-4">
<li>OQS</li><br>
<li>Origami</li><br>
<li>Cashier</li><br>
<li>CRM</li>
</ul>
</div>
@@ -162,8 +160,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#supervisor">Supervisor
<span class="glyphicon glyphicon-plus"></span></a>
Supervisor
</h4>
</div>
<div id="supervisor" class="panel-collapse collapse in">
@@ -185,14 +182,13 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#cashier">Cashier
<span class="glyphicon glyphicon-plus"></span></a>
Cashier
</h4>
</div>
<div id="cashier" class="panel-collapse collapse in">
<div class="panel-body">
<ul class="">
<li class="">Orgami Panel except Edit and Void</li>
<li class="">Cashier Panel except Edit and Void</li>
<li class="">Sale and Order</li>
<li class="">and Queue in CRM</li>
</ul>
@@ -203,8 +199,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#accountant">Accountant
<span class="glyphicon glyphicon-plus"></span></a>
Accountant
</h4>
</div>
<div id="accountant" class="panel-collapse collapse in">
@@ -223,11 +218,11 @@
</div>
</div> <!-- end col-md-4 -->
<div class="footer">
<div class="footer" style="background-color: inherit">
<div class="card">
<div class="page-header center-text">
<h4 class="footer-header">
<%= shop.name %>
<%= shop.name %>
</h4>
</div>
<div class="center-text">