Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

This commit is contained in:
Aung Myo
2017-10-12 18:17:29 +06:30
13 changed files with 108 additions and 299 deletions

View File

@@ -1,6 +1,6 @@
<div class="container-fluid">
<div class="block-header">
<h2>DASHBOARD</h2>
<h2><%= t :dashboard %></h2>
</div>
<!-- Widgets -->
@@ -57,7 +57,7 @@
<div class="row">
<div class="col-md-6">
<div class="panel">
<div class="panel-heading"><h4>Top Products</h4></div>
<div class="panel-heading"><h4><%= (t :top) + " " + (t :products) %></h4></div>
<div class="panel-body">
<canvas id="top_products" class="col-md-12"></canvas>
</div>
@@ -65,7 +65,7 @@
</div>
<div class="col-md-6">
<div class="panel">
<div class="panel-heading"><h4>Inventory</h4></div>
<div class="panel-heading"><h4><%= t :inventory %></h4></div>
<div class="panel-body">
<canvas id="inventory" class="col-md-12"></canvas>
</div>
@@ -76,7 +76,7 @@
<div class="row">
<div class="col-md-6">
<div class="panel">
<div class="panel-heading"><h4>Hourly Sales</h4></div>
<div class="panel-heading"><h4><%= (t :hourly) + " " + (t :sale) %></h4></div>
<div class="panel-body">
<canvas id="hourly_sales" class="col-md-12"></canvas>
</div>
@@ -84,7 +84,7 @@
</div>
<div class="col-md-6">
<div class="panel">
<div class="panel-heading"><h4>Employee Sales</h4></div>
<div class="panel-heading"><h4><%= (t :staff) + " " + (t :sale) %></h4></div>
<div class="panel-body">
<canvas id="employee_sales" class="col-md-12"></canvas>
</div>

View File

@@ -16,7 +16,7 @@
<!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
<a href="javascript:void(0);" class="bars"></a>
<a class="navbar-brand" href="index.html">
<img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span>
</a>
</div>
@@ -27,7 +27,7 @@
</a>
<ul class="dropdown-menu">
<li>
<%= link_to 'Logout',logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->
</li>
</ul>

View File

@@ -28,58 +28,58 @@
<!-- Menu -->
<div class="menu">
<ul class="list">
<li class="header">MAIN NAVIGATION</li>
<li class="header"><%= t :main_navigation %></li>
<li class="active">
<a href="<%= dashboard_path %>">
<i class="material-icons">home</i>
<span>Home</span>
<span><%= t :dashboard %></span>
</a>
</li>
<li>
<a href="<%= oqs_root_path %>">
<i class="material-icons">room_service</i>
<span>Order Queue Station</span>
<span><%= t :oqs %></span>
</a>
</li>
<li>
<a href="<%= origami_root_path %>">
<i class="material-icons">monetization_on</i>
<span>Cashier</span>
<span><%= t :origami %></span>
</a>
</li>
<li>
<a href="<%= crm_customers_path %>">
<i class="material-icons">group</i>
<span>CRM</span>
<span><%= t :crm %></span>
</a>
</li>
<li>
<a href="<%= inventory_path %>">
<i class="material-icons">store</i>
<span>Inventory</span>
<span><%= t :inventory %></span>
</a>
</li>
<li>
<a href="javascript:void(0);" class="menu-toggle">
<i class="material-icons">widgets</i>
<span>Transaction</span>
<span><%= t :transactions %></span>
</a>
<ul class="ml-menu">
<li>
<a href="<%= transactions_orders_path %>">Order</a>
<a href="<%= transactions_orders_path %>"><%= t :orders %></a>
</li>
<li>
<a href="<%= transactions_sales_path %>">Sale</a>
<a href="<%= transactions_sales_path %>"><%= t :sale %></a>
</li>
<li>
<a href="<%= transactions_credit_notes_path %>">Credit Note</a>
<a href="<%= transactions_credit_notes_path %>"><%= (t :credit) + " " + (t :reports) %></a>
</li>
</ul>
</li>
<li>
<a href="javascript:void(0);" class="menu-toggle">
<i class="material-icons">assessment</i>
<span>Report</span>
<span><%= t :reports %></span>
</a>
<ul class="ml-menu">
<li>
@@ -108,41 +108,41 @@
</li>
</ul>
</li>
<li class="header">SETTINGS</li>
<li class="header"><%= t :settings %></li>
<li>
<a href="<%= settings_zones_path %>">
<i class="material-icons col-red">donut_large</i>
<span>Dinings</span>
<span><%= t :dinings %></span>
</a>
</li>
<li>
<a href="<%= settings_menus_path %>">
<i class="material-icons col-amber">donut_large</i>
<span>Menu</span>
<span><%= t :menu %></span>
</a>
</li>
<li>
<a href="<%= settings_employees_path %>">
<i class="material-icons col-light-blue">donut_large</i>
<span>Staffs</span>
<span><%= t :staff %></span>
</a>
</li>
<li>
<a href="<%= settings_cashier_terminals_path %>">
<i class="material-icons col-green">donut_large</i>
<span>Cashiers</span>
<span><%= (t :cashier) + " " + (t :terminal) %></span>
</a>
</li>
<li>
<a href="<%= print_settings_path %>">
<i class="material-icons col-pupple">donut_large</i>
<span>Printers</span>
<span><%= t :printer %></span>
</a>
</li>
<li>
<a href="<%= settings_products_path %>">
<i class="material-icons col-brown">donut_large</i>
<span>Products</span>
<span><%= t :products %></span>
</a>
</li>
</ul>

View File

@@ -1,36 +0,0 @@
<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>

View File

@@ -47,7 +47,7 @@
</section>
<!-- Main Content -->
<section class="content">
<section class="content">
<%= yield %>
</section>
</body>

View File

@@ -58,9 +58,11 @@
<!-- #END# Page Loader -->
<div class="login-box">
<div class="logo">
<a href="javascript:void(0);">Smartsale <b>SX</b></a>
<small>Version - 1.0.1</small>
<div class="logo text-center">
<img src="/image/SX-logo.png" width="150px" height="150px">
<p>
<small>Version - 1.0.1</small>
</p>
</div>
<%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
<div class="card padding-10">
@@ -89,9 +91,9 @@
<div class="pin_pad left" data-value="9">9</div>
</div>
<div class='row bottom'>
<div class="pin_pad orange" data-value="CLR">CLR</div>
<div class="pin_pad bg-grey" data-value="CLR">CLR</div>
<div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad left purple" data-value="ENT">ENT</div>
<div class="pin_pad left bg-indigo" data-value="ENT">ENT</div>
</div>
</div>
</div>