merge with staging

This commit is contained in:
Yan
2017-10-12 09:59:24 +06:30
89 changed files with 1810 additions and 1372 deletions

View File

@@ -14,7 +14,7 @@
</head>
<body>
<%= render 'layouts/header_oqs' %>
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>
<div class="alert fade in">

View File

@@ -31,8 +31,11 @@
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->
</li>
</ul>
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a>
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
<i class="material-icons">more_vert</i>
</a>
</div>
</div>
</nav>
<!-- #Top Bar

View File

@@ -0,0 +1,36 @@
<div id="sidebar-wrapper">
<ul id="accordion" class="accordion sidebar-nav">
<li class="header"><a>Main Navigation</a></li>
<li><%= link_to "Dashboard ", dashboard_path,:class =>"" %> </li>
<li><%= link_to "OQS ", oqs_root_path,:class =>"" %></li>
<li><%= link_to "Cashier ", origami_root_path,:class =>"" %></li>
<li>
<div class="link">CRM<i class="fa fa-chevron-down"></i>
</div>
<ul class="submenu">
<li> <%= link_to "Customer ", crm_customers_path,:class =>"" %></li>
<li> <%= link_to "Queue ", crm_dining_queues_path,:class =>"" %></li>
</ul>
</li>
<li><%= link_to "Inventory ", inventory_path,:class =>"" %></li>
<li class="header"><a>Settings</a></li>
<li><%= link_to "Zones ", settings_zones_path,:class =>"" %></li>
<li><%= link_to "Order Queue Station ", settings_order_queue_stations_path,:class =>"" %></li>
<li><%= link_to "Menu ", settings_menus_path,:class =>"" %></li>
<li>
<div class="link">Transactions<i class="fa fa-chevron-down"></i>
</div>
<ul class="submenu">
<li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
<li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
<li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
</ul>
</li>
<li><%= link_to "Cashier Terminal ", settings_cashier_terminals_path,:class =>"" %></li>
<li><%= link_to "Print Settings ", print_settings_path,:class =>"" %></li>
<li><%= link_to "Staff ", settings_employees_path,:class =>"" %></li>
<li><%= link_to "Product ", settings_products_path,:class =>"" %></li>
<li><%= link_to "Promotion ", settings_promotions_path,:class =>"" %></li>
<li><%= link_to "Reports", reports_dailysale_index_path, :class =>"" %></li>
</ul>
</div>