update origin themem change sidebar

app/assets/javascripts/addorder.js

@@ -5,8 +5,6 @@ $(function(){
     var menu_id = $(this).find(".menu-id").text();
 //    var url = $(this).attr('data-ref');
     var url = "get_menu_category/"+menu_id;
-    console.log(url);
-    console.log(menu_id)
     show_menu_item_list(url); 
   }); 
   //End menu category Click

app/assets/stylesheets/CRM.scss

@@ -47,10 +47,10 @@
 }
 .card-columns {
   @include media-breakpoint-only(lg) {
-    column-count: 5;
+    column-count: 4;
   }
   @include media-breakpoint-only(xl) {
-    column-count: 5;
+    column-count: 4;
   }
 }
 

app/assets/stylesheets/application.scss

@@ -21,7 +21,7 @@
 
 .setting_nav{
 	background-color: #2f5663;
-  height: 53px;
+  height: 50px;
 }
 
 ul.navbar-nav li a{

app/assets/stylesheets/settings.scss

@@ -185,16 +185,16 @@ ul.dropdown-menu li a{
 
 @media (min-width: 62em) {
   .card-columns {
-    -webkit-column-count: 4;
-    -moz-column-count: 4;
-    column-count: 4;
+    -webkit-column-count: 3;
+    -moz-column-count: 3;
+    column-count: 3;
   }
 }
 
 @media (min-width: 75em) {
   .card-columns {
-    -webkit-column-count: 5;
-    -moz-column-count: 5;
-    column-count: 5;
+    -webkit-column-count: 4;
+    -moz-column-count: 4;
+    column-count: 4;
   }
 }

app/views/layouts/_header.html.erb

@@ -6,7 +6,7 @@
   </a>  
   
    <a class="navbar-brand" href="<%= dashboard_path %>" style="color: #fff">
-      <img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
+      <img src="<%= asset_path('SX-Logo-small.png') %>" width="30" height="30" alt="Logo" />
       <span class="navbar-brand-txt">SX Restaurant</span>
    </a>
 

app/views/layouts/_sidebar.html.erb

@@ -17,9 +17,9 @@
       <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>
-        <li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
-        <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
+        <li> <%= link_to (t :orders), transactions_orders_path,:class =>"" %></li>
+        <li> <%= link_to (t :sale), transactions_sales_path,:class =>"" %></li>
+        <li> <%= link_to (t :credit), transactions_credit_notes_path,:class =>"m" %></li>
       </ul>
     </li>
     <li>
@@ -39,19 +39,16 @@
     <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><%= 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>
-    <li><%= link_to "Promotion ", settings_promotions_path,:class =>"" %></li>
+    <li><%= link_to (t :printer), print_settings_path,:class =>"" %></li>
+    <li><%= link_to (t :staff), settings_employees_path,:class =>"" %></li>
+    <li><%= link_to (t :products), settings_products_path,:class =>"" %></li>
+    <li><%= link_to (t :promotions), settings_promotions_path,:class =>"" %></li>
     <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
     <li><%= link_to "Item Sets ", settings_item_sets_path, :tabindex =>"-1" %></li>
     <li><%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %></li>
     <li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li>
     <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
     <li><%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
-
- 
   </ul>
 </div>

app/views/oqs/home/index.html.erb

@@ -173,6 +173,13 @@
 
   </div>
 </div>
-<script type="text/javascript">
-  
-</script>
+<style type="text/css">
+.card-columns {
+  @include media-breakpoint-only(lg) {
+    column-count: 4 !important;
+  }
+  @include media-breakpoint-only(xl) {
+    column-count: 4 !important;
+  }
+}
+</style>

config/application.rb

@@ -13,7 +13,7 @@ module SXRestaurants
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-    config.i18n.default_locale = :'en'
+    config.i18n.default_locale = :'mm'
 
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq

config/locales/en.yml

@@ -10,16 +10,85 @@ en:
   transactions: "Transactions"
   reports: "Reports"
   zones: "Zones"
+  dinings: "Dinings"
   menu: "Menu"
   cashier: "Cashier"
   terminal: "Terminal"
   print: "Print"
   staff: "Staff"
-  product: "Product"
-  promotion: "Promotion"
-
+  products: "Products"
+  promotions: "Promotions"
+  printer: "Printer"
+  logout: "Logout"
+  sale: "Sale"
+  hourly: "Hourly"
+  top: "Top"
+  orders: "Orders"
+  credit: "Credit"
+  home: "Home"
+  simple_menu_item: "Simple Menu Item"
+  set_menu_item: "Set Menu Item"
+  table: "Table"
+  room: "Room"
+  item_set: "Item Set"
+  category: "Category"
+  processed: "Processed"
+  competed: "Completed"
 
   views:
+    btn:
+      create: "Create"
+      new: "New"
+      add: "Add"
+      edit: "Edit"
+      update: "Update"
+      cancel: "Cancel"
+      back: "Back"
+      show: "Show"
+      remove: "Remove"
+      delete: "Delete"
+      destroy: "Destroy"
+      submit: "Submit"
+      reset: "Reset"
+      search: "Search"
+      enter: "Enter"
+      clear: "Clear"
+      finish: "Finish"
+      filter: "Filter"
+      del: "DEL"
+      clr: "CLR"
+
+      print_order_summary: "Print Order Summary"
+      memeber_card: "Member Card"
+      qr_code: "QR Code"
+      cash_in: "CASH IN"
+      cash_out: "CASH OUT"
+      close_cashier: "CLOSE CASHIER"
+      add_order: "ADD ORDER"
+      customer: "CUSTOMER"
+      discount: "DISCOUNT"
+      charges: "CHARGES"
+      commissions: "COMMISSIONS"
+      in_duties: "IN DUTIES"
+      move: "MOVE"
+      req_bill: "REQ BILL"
+      first_bill: "FIRST BILL"
+      pay: "PAY"
+      void: "VOID"
+      foc: "FOC"
+      nett: "NETT"
+      cash: "CASH"
+      credit: "CREDIT"
+      other_payment: "Other Payment"
+      percentage: "PERCENTAGE"
+      remove_item_dis: "REMOVE ITEM DISCOUNT"
+      remove_all: "REMOVE ALL"
+      new_stock_taking: "NEW STOCK TAKING"
+      stock_check_report: "STOCK CHECK REPORT"
+      new_inventory_product: "NEW INVENTORY PRODUCT"
+      generate_report: "GENERATE REPORT"
+      exp_to_excel: "EXPORT TO EXCEL"
+
     pagination:
       first: "« First"
       last: "Last »"

config/locales/mm.yml

@@ -3,21 +3,93 @@ mm:
   main_navigation: "မာတိကာ"
   dashboard: "မျက်နှာစာ"
   oqs: "အမှာစာနေရာများ"
-  origami: "အရောင်းဌာန"
+  origami: "အရောင်းကောင်တာ"
   crm: "စားသုံးသူကြီးကြပ်ရေး"
   inventory: "ကုန်လှောင်ရုံ"
   settings: "သတ်မှတ်ချက်များ"
-  transactions: "အလုပ်ဲပြီးမြောက်မှု့များ"
+  transactions: "အလုပ်ပြီးမြောက်မှု့များ"
   reports: "အစီရင်ခံစာ"
-  zones: "Zones"
-  menu: "Menu"
-  cashier: "Cashier"
-  terminal: "Terminal"
-  print: "Print"
-  staff: "Staff"
-  product: "Product"
-  promotion: "Promotion"
+  zones: "ဇုန်"
+  dinings: "စားပွဲရုံ"
+  menu: "စားဖွယ်စုံ"
+  cashier: "ငွေရှင်း"
+  terminal: "ကောင်တာ"
+  print: "စာထုတ်ပါ"
+  staff: "၀န်ထမ်းများ"
+  products: "ကုန်စည်များ"
+  promotions: "အရောင်းမြှင့်တင်ရေး"
+  printer: "ပရင့်တာ"
+  logout: "ထွက်ရန်"
+  sale: "အရောင်း"
+  hourly: "နာရီအလိုက်"
+  top: "အရောင်းရဆုံး"
+  orders: "အော်ဒါများ"
+  credit: "အကြွေး"
+  home: "မူလစာမျက်နှာ"
+  simple_menu_item: "ဟင်းလျာများ"
+  set_menu_item: "တွဲဖက်ဟင်းလျာများ"
+  table: "စားပွဲ"
+  room: "အခန်း"
+  item_set: "တွဲဖက်ဟင်းလျာ"
+  category: "အမျိုးအစား"
+  processed: "လုပ်ဆောင်ခဲ့ပြီး"
+  completed: "ဆောင်ရွက်ပြီးစီး"
+  
   views:
+    btn:       
+      create: "အသစ်တည်ဆောက်ရန်"
+      new: "အသစ်ခေါ်ရန်"
+      add: "ထည့်သွင်းရန်"
+      edit: "ပြင်ဆင်ရန်"
+      update: "ထပ်မံထည့်သွင်းရန်"
+      cancel: "ဖျက်သိမ်းရန်"
+      back: "နောက်သို့"
+      show: "ပြသရန်"
+      remove: "ဖယ်ရှားရန်"
+      delete: "ဖျက်ပစ်ရန်"
+      destroy: "ဖျက်စီးရန်"
+      submit: "တင်သွင်းရန်"
+      reset: "ပြန်ညှိမှု"
+      search: "ရှာရန်"
+      enter: "ဝင်ရန်"
+      clear: "ရှင်းလင်းရန်"
+      finish: "ပြီးစီးရန်"
+      filter: "ဇကာစစ်ရှာဖွေရန်"
+      del: "ဖျက်ပါ"
+      clr: "ရှင်းပါ"
+
+      print_order_summary: "အော်ဒါအကျဉ်းချုပ်များ စာရွက်ထုတ်ရန်"
+      memeber_card: "အသင်းဝင်ကတ်ပြား"
+      qr_code: "QR ကုတ်ဒ်"
+      cash_in: "ပိုက်ဆံထည့်သွင်းရန်"
+      cash_out: "ပိုက်ဆံထုတ်ယူရန်"
+      close_cashier: "ငွေရှင်းကောင်တာပိတ်ရန်"
+      add_order: "အော်ဒါများထည့်သွင်းရန်"
+      customer: "စားသုံးသူ"
+      discount: "လျှော့စျေး"
+      charges: "ပိုက်ဆံကောက်သည်"
+      commissions: "ကော်မရှင်များ"
+      in_duties: "တာဝန်ကျသူများ"
+      move: "ရွေ့ပြောင်းသည်"
+      req_bill: "ကျသင့်ငွေတောင်းခံသည်"
+      first_bill: "ပထမငွေတောင်းခံလွှာ"
+      pay: "ပေးသည်"
+      void: "အတည်မဖြစ်ပါ"
+      foc: "မေတ္တာဖြင့်ကျွေးမွေးသည်"
+      nett: "အသားတင်"
+      cash: "ငွေသား"
+      credit: "အကြွေး"
+      other_payment: "အခြားငွေပေးဆောင်မှုများ"
+      percentage: "ရာခိုင်နှုန်း"
+      remove_item_dis: "တပွဲချင်းစျေးလျှော့ပေးခြင်းပြန်လည်ဖယ်ရှားရန်"
+      remove_all: "အားလုံးဖယ်ရှားရန်"
+      new_stock_taking: "ပစ္စည်းစာရင်းအသစ်ထည့်သွင်းရန်"
+      stock_check_report: "ပစ္စည်းစာရင်းစစ်ဆေးမှုအစီရင်ခံစာ"
+      new_inventory_product: "ကုန်လှောင်ရုံရောက်ပစ္စည်းအသစ်များ"
+      generate_report: "အစီရင်ခံစာများရှာဖွေရန်"
+      exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်"
+
+
     pagination:
       first: "« ပထမ"
       last: "အဆံုး »"