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

merge with staging

Browse Source
This commit is contained in:
Yan
2017-10-12 14:49:28 +06:30
parent 429842ad9c 150bb1a751
commit b7955b04fa
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/layouts/_sidebar.html.erb
View File

@@ -1,24 +1,24 @@
<div id="sidebar-wrapper"> <div id="sidebar-wrapper">
<ul id="accordion" class="accordion sidebar-nav"> <ul id="accordion" class="accordion sidebar-nav">
<li class="header"><a>Main Navigation</a></li> <li class="header"><a><%= t :main_navigation %></a></li>
<li><%= link_to "Dashboard ", dashboard_path,:class =>"" %> </li> <li><%= link_to (t :dashboard), dashboard_path,:class =>"" %> </li>
<li><%= link_to "OQS ", oqs_root_path,:class =>"" %></li> <li><%= link_to (t :oqs), oqs_root_path,:class =>"" %></li>
<li><%= link_to "Cashier ", origami_root_path,:class =>"" %></li> <li><%= link_to (t :origami), origami_root_path,:class =>"" %></li>
<li> <li>
<div class="link">CRM<i class="fa fa-chevron-down"></i> <div class="link"><%= t :crm %><i class="fa fa-chevron-down"></i>
</div> </div>
<ul class="submenu"> <ul class="submenu">
<li> <%= link_to "Customer ", crm_customers_path,:class =>"" %></li> <li> <%= link_to "Customer ", crm_customers_path,:class =>"" %></li>
<li> <%= link_to "Queue ", crm_dining_queues_path,:class =>"" %></li> <li> <%= link_to "Queue ", crm_dining_queues_path,:class =>"" %></li>
</ul> </ul>
</li> </li>
<li><%= link_to "Inventory ", inventory_path,:class =>"" %></li> <li><%= link_to (t :inventory), inventory_path,:class =>"" %></li>
<li class="header"><a>Settings</a></li> <li class="header"><a><%= t :settings %></a></li>
<li><%= link_to "Zones ", settings_zones_path,:class =>"" %></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 "Order Queue Station ", settings_order_queue_stations_path,:class =>"" %></li>
<li><%= link_to "Menu ", settings_menus_path,:class =>"" %></li> <li><%= link_to "Menu ", settings_menus_path,:class =>"" %></li>
<li> <li>
<div class="link">Transactions<i class="fa fa-chevron-down"></i> <div class="link"><%= t 'transactions' %><i class="fa fa-chevron-down"></i>
</div> </div>
<ul class="submenu"> <ul class="submenu">
<li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li> <li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
@@ -26,7 +26,7 @@
<li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li> <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
</ul> </ul>
</li> </li>
<li><%= link_to "Cashier Terminal ", settings_cashier_terminals_path,:class =>"" %></li> <li><%= link_to (t :cashier), settings_cashier_terminals_path,:class =>"" %></li>
<li><%= link_to "Print Settings ", print_settings_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 "Staff ", settings_employees_path,:class =>"" %></li>
<li><%= link_to "Product ", settings_products_path,:class =>"" %></li> <li><%= link_to "Product ", settings_products_path,:class =>"" %></li>

19
config/locales/en.yml
View File

@@ -1,5 +1,24 @@
en: en:
welcome: "Welcome" 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"
menu: "Menu"
cashier: "Cashier"
terminal: "Terminal"
print: "Print"
staff: "Staff"
product: "Product"
promotion: "Promotion"
views: views:
pagination: pagination:
first: "&laquo; First" first: "&laquo; First"