diff --git a/app/assets/images/SX-Logo-small.png b/app/assets/images/SX-Logo-small.png new file mode 100644 index 00000000..be14a5c9 Binary files /dev/null and b/app/assets/images/SX-Logo-small.png differ diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index b30ae2b8..47f3389c 100644 --- a/app/assets/javascripts/addorder.js +++ b/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 diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index df008329..96ec1313 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/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; } } diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6e7fee04..eb206ef6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -21,7 +21,7 @@ .setting_nav{ background-color: #2f5663; - height: 53px; + height: 50px; } ul.navbar-nav li a{ diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index cd7a48af..fd1c6d1f 100644 --- a/app/assets/stylesheets/settings.scss +++ b/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; } } \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 10f6508e..c949bab0 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -6,7 +6,7 @@ - Logo + Logo SX Restaurant diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb index 59f09e6a..df2b421e 100644 --- a/app/views/layouts/_sidebar.html.erb +++ b/app/views/layouts/_sidebar.html.erb @@ -17,9 +17,9 @@
<%= t 'transactions' %>
  • @@ -39,19 +39,16 @@
  • <%= link_to "Zones ", settings_zones_path,:class =>"" %>
  • <%= link_to "Order Queue Station ", settings_order_queue_stations_path,:class =>"" %>
  • <%= link_to "Menu ", settings_menus_path,:class =>"" %>
    • -
  • <%= link_to (t :cashier), settings_cashier_terminals_path,:class =>"" %>
    • -
  • <%= link_to "Print Settings ", print_settings_path,:class =>"" %>
    • -
  • <%= link_to "Staff ", settings_employees_path,:class =>"" %>
    • -
  • <%= link_to "Product ", settings_products_path,:class =>"" %>
    • -
  • <%= link_to "Promotion ", settings_promotions_path,:class =>"" %>
    • +
  • <%= link_to (t :printer), print_settings_path,:class =>"" %>
    • +
  • <%= link_to (t :staff), settings_employees_path,:class =>"" %>
    • +
  • <%= link_to (t :products), settings_products_path,:class =>"" %>
    • +
  • <%= link_to (t :promotions), settings_promotions_path,:class =>"" %>
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
  • <%= link_to "Item Sets ", settings_item_sets_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
  • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
  • <%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %>
    • - - diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 468cd58b..11003139 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -173,6 +173,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 4a8b873a..abeac50e 100644 --- a/config/application.rb +++ b/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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 39bd8303..dc49b5a5 100644 --- a/config/locales/en.yml +++ b/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 »" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 711041d5..a998f2ac 100644 --- a/config/locales/mm.yml +++ b/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: "အဆံုး »"