From 150bb1a7513801c1b085e83ac6051fd09b9cf6c3 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 14:44:30 +0630 Subject: [PATCH 1/6] add mm --- app/views/layouts/_sidebar.html.erb | 18 +++++++++--------- app/views/layouts/application.html.erb | 1 - config/locales/en.yml | 19 +++++++++++++++++++ config/locales/mm.yml | 19 ++++++++++++++++++- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb index 571e7632..b74ec6ae 100644 --- a/app/views/layouts/_sidebar.html.erb +++ b/app/views/layouts/_sidebar.html.erb @@ -1,24 +1,24 @@ <% end %> <% end %> -

<%= t 'welcome' %>

<%= yield %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ba4f31fa..39bd8303 100644 --- a/config/locales/en.yml +++ b/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" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 69a9131e..711041d5 100644 --- a/config/locales/mm.yml +++ b/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: "« ပထမ" From 429842ad9c45d1ec46e0713fb3ad6562370631db Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 14:46:04 +0630 Subject: [PATCH 2/6] add mm menu --- config/locales/mm.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 69a9131e..711041d5 100644 --- a/config/locales/mm.yml +++ b/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: "« ပထမ" From a6b8389fd0afc40e58dd8b925ec12742bd552a51 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 15:34:16 +0630 Subject: [PATCH 3/6] add mm --- app/controllers/application_controller.rb | 10 ++++---- app/views/layouts/_left_sidebar.html.erb | 30 +++++++++++------------ app/views/layouts/application.html.erb | 1 + config/locales/mm.yml | 6 +++-- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index da72a194..33ee425c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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 diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 9af8fcac..aaa89fc9 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -28,41 +28,41 @@
    -
  • MAIN NAVIGATION
    • +
  • <%= t :main_navigation %>
  • home - Home + <%= t :dashboard %>
  • room_service - Order Queue Station + <%= t :oqs %>
  • monetization_on - Cashier + <%= t :origami %>
  • group - CRM + <%= t :crm %>
  • store - Inventory + <%= t :inventory %>
  • widgets - Transaction + <%= t :transactions %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6e8dd5f9..86070612 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -48,6 +48,7 @@
    +

    <%= t :welcome %>

    <%= yield %>
    diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 711041d5..c37d3927 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -10,13 +10,15 @@ mm: transactions: "အလုပ်ဲပြီးမြောက်မှု့များ" 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" views: pagination: first: "« ပထမ" From cd5f2eb748d080384a08e9c8b69f25ec7910a9a1 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 15:42:06 +0630 Subject: [PATCH 4/6] remove _sidebar and add mm --- app/assets/stylesheets/application.scss | 7 + app/assets/stylesheets/sx-sidebar.css | 225 ----------------------- app/views/layouts/_left_sidebar.html.erb | 2 +- app/views/layouts/_sidebar.html.erb | 36 ---- app/views/layouts/application.html.erb | 3 +- config/locales/mm.yml | 2 +- 6 files changed, 10 insertions(+), 265 deletions(-) delete mode 100644 app/assets/stylesheets/sx-sidebar.css delete mode 100644 app/views/layouts/_sidebar.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 771b1d48..89e75d3d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -109,6 +109,13 @@ section.content { opacity: 1; } +.sidebar .menu .list .header { + background: #eee; + font-size: 12px; + font-weight: bold; + padding: 8px 16px; +} + /* End Reset Theme */ /* *************************************************** */ diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css deleted file mode 100644 index 3f07bdad..00000000 --- a/app/assets/stylesheets/sx-sidebar.css +++ /dev/null @@ -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; -} - - - diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index aaa89fc9..bc891cd5 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -130,7 +130,7 @@
  • donut_large - <%= t :cashier + " " + t :terminal %> + <%= (t :cashier) + " " + (t :terminal) %>
  • diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb deleted file mode 100644 index b74ec6ae..00000000 --- a/app/views/layouts/_sidebar.html.erb +++ /dev/null @@ -1,36 +0,0 @@ - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 86070612..8fec7974 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -47,8 +47,7 @@ -
    -

    <%= t :welcome %>

    +
    <%= yield %>
    diff --git a/config/locales/mm.yml b/config/locales/mm.yml index c37d3927..a4c1c1bb 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -7,7 +7,7 @@ mm: crm: "စားသုံးသူကြီးကြပ်ရေး" inventory: "ကုန်လှောင်ရုံ" settings: "သတ်မှတ်ချက်များ" - transactions: "အလုပ်ဲပြီးမြောက်မှု့များ" + transactions: "အလုပ်ပြီးမြောက်မှု့များ" reports: "အစီရင်ခံစာ" zones: "Zones" dinings: "Dinings" From 5df78b10ed3052a09be6863fc5755be61d56bda5 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 16:17:20 +0630 Subject: [PATCH 5/6] change login ui from ko kyawS --- app/assets/images/SX-Logo-small.png | Bin 0 -> 989 bytes app/assets/stylesheets/login.scss | 10 +++++++++- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/login.html.erb | 12 +++++++----- config/locales/en.yml | 6 ++++-- config/locales/mm.yml | 2 ++ 6 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 app/assets/images/SX-Logo-small.png diff --git a/app/assets/images/SX-Logo-small.png b/app/assets/images/SX-Logo-small.png new file mode 100644 index 0000000000000000000000000000000000000000..be14a5c97aa63a9bcc862db43d253ae1a5ae55ed GIT binary patch literal 989 zcmV<310wv1P)n6#eWZwWvBErDoA6aW}~BOyz|c`#{MO*Vq>Is82G$I9;Jl(p^cfm zj^cnM&+|tcTg=me$HXHW4O~rPWEl&AgGL-`$-G)aWETT@wTb}90d?t47p)gU9w+m> z-0(a03Qr_kCs2mk@_QOt?A$VWCDud3QkEePVgHvEbK6@N_E~mO%qwCe&=r?!-fW8m z?qjPy3aq#VN-V@?J&?t%Ua{;BmR~1R?Q^VoAkXUx1W#_aPGF^}e+vWhROMW;+d4F* zSnWaHF%~f?1CYo6FQ_VKp~zqtKEBSpbijbAeRLVHjSwdiQLcOh#}5d_cUXe9OxhW0g~%0Hp!IBWn-t*S!eAwJ|0 zL3kJ(>>Gn`QX#eBYr}iFkas|^uURvBMkL;lyfC?>qW6YQpd)z|#Ycsr!jKvanvb18 zc~78}Pi$0@V&7M7U)lVZxnO{Oxu#wA0ru@cm49g3UObEV25qxoOLtK1K?s%=s^=N3 z4y7;{yb;m(lDGHS09w?o=;XoN(Wkc7+E8CrLoMSuku7-P zQIMdnnY_J*Jc4nPQb5=!A?5%cS1FS4o012lRfg@kJ=RUz0PP}CW1yz%L1P;SN)Uzj zSxbCUT3wvj8hOOVvpRzqR~f_$=Wg#^k_U#Ho(TGT#LC04QIrzg?XuPM(w1k_=6_d) zXWHl@&B<3x9x)M&Oq8N18U{;zU!InPn^w@V$OYxpCv09{BxT(#Uj&-$
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 5644ef74..e5836701 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -58,9 +58,11 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index 39bd8303..8e5f1c99 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,13 +10,15 @@ 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" views: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index a4c1c1bb..6013c33e 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -19,6 +19,8 @@ mm: products: "Products" promotions: "Promotions" printer: "Printer" + + views: pagination: first: "« ပထမ" From 2379079b03e9a9590b08a54e397e7b00e639a995 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 18:08:49 +0630 Subject: [PATCH 6/6] add mm --- app/views/home/dashboard.html.erb | 10 ++++---- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/_left_sidebar.html.erb | 6 ++--- config/locales/en.yml | 7 +++++- config/locales/mm.yml | 29 ++++++++++++++---------- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index b04993ff..0bffc868 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,6 +1,6 @@
-

DASHBOARD

+

<%= t :dashboard %>

@@ -57,7 +57,7 @@
-

Top Products

+

<%= (t :top) + " " + (t :products) %>

@@ -65,7 +65,7 @@
-

Inventory

+

<%= t :inventory %>

@@ -76,7 +76,7 @@
-

Hourly Sales

+

<%= (t :hourly) + " " + (t :sale) %>

@@ -84,7 +84,7 @@
-

Employee Sales

+

<%= (t :staff) + " " + (t :sale) %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 2bf4c073..8d86f8d5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -27,7 +27,7 @@
  • - <%= 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?'} %>
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index bc891cd5..5cd62153 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -66,13 +66,13 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index 8e5f1c99..e8cdce94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,7 +19,12 @@ en: products: "Products" promotions: "Promotions" printer: "Printer" - + logout: "Logout" + sale: "Sale" + hourly: "Hourly" + top: "Top" + orders: "Orders" + credit: "Credit" views: pagination: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 6013c33e..827edf46 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -3,23 +3,28 @@ mm: main_navigation: "မာတိကာ" dashboard: "မျက်နှာစာ" oqs: "အမှာစာနေရာများ" - origami: "အရောင်းဌာန" + origami: "အရောင်းကောင်တာ" crm: "စားသုံးသူကြီးကြပ်ရေး" inventory: "ကုန်လှောင်ရုံ" settings: "သတ်မှတ်ချက်များ" transactions: "အလုပ်ပြီးမြောက်မှု့များ" reports: "အစီရင်ခံစာ" - zones: "Zones" - dinings: "Dinings" - menu: "Menu" - cashier: "Cashier" - terminal: "Terminal" - print: "Print" - staff: "Staff" - products: "Products" - promotions: "Promotions" - printer: "Printer" - + zones: "ဇုန်" + dinings: "စားပွဲရုံ" + menu: "စားဖွယ်စုံ" + cashier: "ငွေရှင်း" + terminal: "ကောင်တာ" + print: "စာထုတ်ပါ" + staff: "၀န်ထမ်းများ" + products: "ကုန်စည်များ" + promotions: "အရောင်းမြှင့်တင်ရေး" + printer: "ပရင့်တာ" + logout: "ထွက်ရန်" + sale: "အရောင်း" + hourly: "နာရီအလိုက်" + top: "အရောင်းရဆုံး" + orders: "အော်ဒါများ" + credit: "အကြွေး" views: pagination: