merge with staging

app/assets/javascripts/application.js

@@ -24,6 +24,7 @@
 //= require daterangepicker
 //= require select2
 //= require jquery.datetimepicker
+//= require Chart
 
 
 $(document).on('turbolinks:load', function() {

app/assets/stylesheets/theme.scss

@@ -3666,7 +3666,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .navbar-brand {
   float: left;
-  padding: 15px 15px;
+  padding: 0px 0px;
   font-size: 18px;
   line-height: 20px;
 }

app/views/home/dashboard.html.erb

@@ -71,8 +71,6 @@
       </div>
 </div>
 
-
-<script src="js/Chart.js"></script>
 <script>
   $(document).ready(function(){
     var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>');

app/views/layouts/_header.html.erb

@@ -5,7 +5,10 @@
       <span class="fa fa-bars" ></span>
   </a>  
   
-   <a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
+   <a class="navbar-brand" href="<%= dashboard_path %>" style="color: #fff">
+      <img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
+      <span class="navbar-brand-txt">SX Restaurant</span>
+   </a>
 
    <div class="collapse navbar-collapse" id="navbarCollapse">
       <!-- <ul class="navbar-nav mr-auto">

app/views/layouts/_sidebar.html.erb

@@ -1,24 +1,24 @@
 <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 class="header"><a><%= t :main_navigation %></a></li>
+    <li><%= link_to (t :dashboard), dashboard_path,:class =>"" %> </li>
+    <li><%= link_to (t :oqs), oqs_root_path,:class =>"" %></li>
+    <li><%= link_to (t :origami), origami_root_path,:class =>"" %></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>
       <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 (t :inventory), inventory_path,:class =>"" %></li>
+    <li class="header"><a><%= t :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 class="link"><%= t 'transactions' %><i class="fa fa-chevron-down"></i>
       </div>
       <ul class="submenu">
         <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>
       </ul>
     </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 "Staff ", settings_employees_path,:class =>"" %></li>
     <li><%= link_to "Product ", settings_products_path,:class =>"" %></li>

config/locales/en.yml

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

config/locales/mm.yml

@@ -1,5 +1,22 @@
 mm:
-  welcome: "လာပါ"
+  welcome: "မဂ်လာပါ"
+  main_navigation: "မာတိကာ"
+  dashboard: "မျက်နှာစာ"
+  oqs: "အမှာစာနေရာများ"
+  origami: "အရောင်းဌာန"
+  crm: "စားသုံးသူကြီးကြပ်ရေး"
+  inventory: "ကုန်လှောင်ရုံ"
+  settings: "သတ်မှတ်ချက်များ"
+  transactions: "အလုပ်ဲပြီးမြောက်မှု့များ"
+  reports: "အစီရင်ခံစာ"
+  zones: "Zones"
+  menu: "Menu"
+  cashier: "Cashier"
+  terminal: "Terminal"
+  print: "Print"
+  staff: "Staff"
+  product: "Product"
+  promotion: "Promotion"
   views:
     pagination:
       first: "« ပထမ"