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

Binary file not shown.

After

Width:  |  Height:  |  Size: 989 B

View File

@@ -123,6 +123,14 @@ section.content {
opacity: 1;
}
.sidebar .menu .list .header {
background: #eee;
font-size: 12px;
font-weight: bold;
padding: 8px 16px;
}
.breadcrumb {
font-size:0.87rem;
}

View File

@@ -8,10 +8,18 @@
}
.login-page {
margin: 1% auto;
margin: 0% auto;
background-color: #2790a5;
}
.login-page .login-box .logo small {
display: block;
width: 100%;
text-align: center;
color: #000;
margin-top: -5px;
}
.form-group {
margin-bottom: 15px;
}

View File

@@ -1,225 +0,0 @@
/*!
* Start Bootstrap - Simple Sidebar (http://startbootstrap.com/template-overviews/simple-sidebar)
* Copyright 2013-2017 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE)
*/
/**/
#wrapper {
padding-left: 0;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
#wrapper.toggled {
padding-left: 210px;
}
#sidebar-wrapper {
/* z-index: 1000;*/
/*position: fixed;*/
z-index: 1;
position: ;
left: 200px;
width: 0;
height: 100%;
margin-left: -224px;
margin-top:-20px;
overflow-x: ;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
#wrapper.toggled #sidebar-wrapper {
width: 216px;
}
#page-content-wrapper {
width: 100%;
position: absolute;
padding-top: 20px;
}
#wrapper.toggled #page-content-wrapper {
position: absolute;
margin-right: -200px;
padding-top: 20px;
}
/* Sidebar Styles */
.sidebar-nav {
position: absolute;
background: #222d32;
top: 0;
width: 200px;
margin: 0;
padding: 0;
list-style: none;
}
.sidebar-nav li {
text-indent: 20px;
line-height: 40px;
}
.sidebar-nav>li.header {
color: #4b646f;
background-color: #1a2226;
line-height: 35px !important;
}
.main-nav {
/* background-color: #161926 !important;*/
}
/*.main-nav a {
color: #fff !important;
}
*/
.sidebar-nav li a {
display: block;
text-decoration: none;
color: #999999;
}
.sidebar-nav li a:hover {
text-decoration: none;
color: #fff;
background: rgba(255, 255, 255, 0.2);
}
.sidebar-nav li a:active,
.sidebar-nav li a:focus {
text-decoration: none;
}
.sidebar-nav > .sidebar-brand {
height: 65px;
font-size: 18px;
line-height: 60px;
}
.sidebar-nav > .sidebar-brand a {
color: #999999;
}
.sidebar-nav > .sidebar-brand a:hover {
color: #fff;
background: none;
}
@media(min-width:768px) {
#wrapper {
padding-left: 0;
}
#wrapper.toggled {
padding-left: 209px;
}
#sidebar-wrapper {
width: 0;
}
#wrapper.toggled #sidebar-wrapper {
width: 216px;
}
#page-content-wrapper {
padding-top: 20px;
position: relative;
}
#wrapper.toggled #page-content-wrapper {
position: relative;
margin-right: 0;
padding-top: 20px;
}
}
.accordion {
width: 200px;
list-style: none;
font-size: 14px;
color: #999999 ;
padding: 0px !important;
margin: 0px !important;
}
.accordion .link {
cursor: pointer;
display: block;
/* padding: 15px 15px 15px 42px;
color: #4D4D4D;*/
/* font-size: 14px;
font-weight: 700;*/
/*border-bottom: 1px solid #CCC;*/
position: relative;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
/*.accordion li:last-child .link { border-bottom: 0; }*/
.accordion li i {
position: absolute;
top: 13px;
left: 12px;
font-size: 16px;
color: #999999;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
.accordion li i.fa-chevron-down {
right: 12px;
left: auto;
font-size: 16px;
}
.accordion li .link:hover {
background: rgba(255, 255, 255, 0.2);
color: #FFF;
}
.accordion li.open .link { color: #fff; }
.accordion li.open .link > .submenu { display: block;overflow: hidden;}
.accordion li.open i { color: #fff; }
.accordion li.open i.fa-chevron-down {
-webkit-transform: rotateX(180deg);
-ms-transform: rotateX(180deg);
-o-transform: rotateX(180deg);
transform: rotateX(180deg);
}
.submenu {
display: none;
list-style: none;
margin-left: ;
background: #161926;
font-size: 14px;
}
.submenu li {
margin-left: -38px;
}
.submenu a {
display: block;
text-decoration: none;
color: #d9d9d9;
padding-left:20px;
-webkit-transition: all 0.25s ease;
-o-transition: all 0.25s ease;
transition: all 0.25s ease;
}
.submenu a:hover {
background: #b63b4d;
color: #FFF;
}

View File

@@ -12,11 +12,6 @@ class ApplicationController < ActionController::Base
#all token authentication must be done here
#response format must be set to JSON
rescue_from CanCan::AccessDenied do |exception|
flash[:warning] = exception.message
redirect_to root_path
end
def set_locale
I18n.locale = params[:locale] || I18n.default_locale
end
@@ -72,6 +67,11 @@ class ApplicationController < ActionController::Base
@default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
end
rescue_from CanCan::AccessDenied do |exception|
flash[:warning] = exception.message
redirect_to root_path
end
def current_user
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end

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>

View File

@@ -1,5 +1,31 @@
en:
welcome: "Welcome"
main_navigation: "Main Navigation"
dashboard: "Dashboard"
oqs: "Order Queue Station"
origami: "Cashier"
crm: "CRM"
inventory: "Inventory"
settings: "Settings"
transactions: "Transactions"
reports: "Reports"
zones: "Zones"
dinings: "Dinings"
menu: "Menu"
cashier: "Cashier"
terminal: "Terminal"
print: "Print"
staff: "Staff"
products: "Products"
promotions: "Promotions"
printer: "Printer"
logout: "Logout"
sale: "Sale"
hourly: "Hourly"
top: "Top"
orders: "Orders"
credit: "Credit"
views:
pagination:
first: "&laquo; First"

View File

@@ -1,5 +1,31 @@
mm:
welcome: "လာပါ"
welcome: "မဂ်လာပါ"
main_navigation: "မာတိကာ"
dashboard: "မျက်နှာစာ"
oqs: "အမှာစာနေရာများ"
origami: "အရောင်းကောင်တာ"
crm: "စားသုံးသူကြီးကြပ်ရေး"
inventory: "ကုန်လှောင်ရုံ"
settings: "သတ်မှတ်ချက်များ"
transactions: "အလုပ်ပြီးမြောက်မှု့များ"
reports: "အစီရင်ခံစာ"
zones: "ဇုန်"
dinings: "စားပွဲရုံ"
menu: "စားဖွယ်စုံ"
cashier: "ငွေရှင်း"
terminal: "ကောင်တာ"
print: "စာထုတ်ပါ"
staff: "၀န်ထမ်းများ"
products: "ကုန်စည်များ"
promotions: "အရောင်းမြှင့်တင်ရေး"
printer: "ပရင့်တာ"
logout: "ထွက်ရန်"
sale: "အရောင်း"
hourly: "နာရီအလိုက်"
top: "အရောင်းရဆုံး"
orders: "အော်ဒါများ"
credit: "အကြွေး"
views:
pagination:
first: "&laquo; ပထမ"