diff --git a/app/models/commission.rb b/app/models/commission.rb index 40d69f81..84771e9f 100755 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -8,6 +8,9 @@ class Commission < ApplicationRecord has_many :commissioners has_many :product_commissions + # validations + validates_presence_of :commission_type, :amount + private def generate_custom_id self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM') diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb index 17fa2036..2b262afc 100755 --- a/app/models/commissioner.rb +++ b/app/models/commissioner.rb @@ -4,4 +4,7 @@ class Commissioner < ApplicationRecord has_many :in_juties has_many :product_commissions scope :active, -> { where(is_active: true) } + + # validations + validates_presence_of :name end diff --git a/app/models/payment_method_setting.rb b/app/models/payment_method_setting.rb index 1a7f26b1..2ffff25d 100755 --- a/app/models/payment_method_setting.rb +++ b/app/models/payment_method_setting.rb @@ -1,2 +1,4 @@ class PaymentMethodSetting < ApplicationRecord + # validations + validates_presence_of :payment_method, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id end diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb index b715af52..54afdfae 100755 --- a/app/models/print_setting.rb +++ b/app/models/print_setting.rb @@ -1,2 +1,4 @@ class PrintSetting < ApplicationRecord + # validations + validates_presence_of :name, :unique_code, :font, :api_settings, :printer_name, :page_width, :page_height, :print_copies, :heading_space end diff --git a/app/models/tax_profile.rb b/app/models/tax_profile.rb index 6e14b2f8..e478ecd5 100755 --- a/app/models/tax_profile.rb +++ b/app/models/tax_profile.rb @@ -1,4 +1,5 @@ class TaxProfile < ApplicationRecord default_scope { order('order_by asc') } - + # validations + validates_presence_of :name, :rate end diff --git a/app/views/crm/dining_queues/edit.html.erb b/app/views/crm/dining_queues/edit.html.erb index 7e8081cb..bf0c3b10 100755 --- a/app/views/crm/dining_queues/edit.html.erb +++ b/app/views/crm/dining_queues/edit.html.erb @@ -2,9 +2,9 @@
<%= render 'form', dining_queue: @dining_queue %> diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index db7c7d81..d7ee6f06 100755 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -1,8 +1,8 @@
    -
  • Home
    • -
  • Queue
    • +
  • <%= t("views.right_panel.button.home") %>
    • +
  • <%= t("en.queue") %>
    • <%= link_to 'Back', dashboard_path %> diff --git a/app/views/crm/dining_queues/new.html.erb b/app/views/crm/dining_queues/new.html.erb index a33db5ac..19a12c5b 100755 --- a/app/views/crm/dining_queues/new.html.erb +++ b/app/views/crm/dining_queues/new.html.erb @@ -1,9 +1,9 @@
      -
    • Home
      • -
    • Queue
      • -
    • New
      • +
    • <%= t("views.right_panel.button.home") %>
      • +
    • <%= t("en.queue") %>
      • +
    • <%= t("views.btn.new") %>
      • <%= link_to 'Back', crm_dining_queues_path %> diff --git a/app/views/print_settings/edit.html.erb b/app/views/print_settings/edit.html.erb index 6d4f0ded..c115917d 100755 --- a/app/views/print_settings/edit.html.erb +++ b/app/views/print_settings/edit.html.erb @@ -1,10 +1,10 @@
        -
      1. Home
        2. -
      2. Print Setting
        3. -
      3. Edit
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t("views.right_panel.header.print_settings") %>
        6. +
      6. <%= t("views.btn.edit") %>
        7. - <%= link_to t('.new', :default => t("views.btn.new")), print_settings_path %> + <%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %>
      diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index 484f806c..70ce02ef 100755 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -2,8 +2,8 @@
        -
      1. Home
        2. -
      2. Print Settings
        3. +
      3. <%= t("views.right_panel.button.home") %>
        4. +
      4. <%= t("views.right_panel.header.print_settings") %>
        5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -18,19 +18,19 @@ - - + + - - + + - - - + + + - + diff --git a/app/views/print_settings/new.html.erb b/app/views/print_settings/new.html.erb index fb2ab925..01c75785 100755 --- a/app/views/print_settings/new.html.erb +++ b/app/views/print_settings/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Print Setting
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.print_settings") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), print_settings_path %> diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 9fe0ec32..c1cf0ac3 100755 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Print Setting
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.header.print_settings") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> @@ -15,39 +15,39 @@
        NameUnique code<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.unique_code") %> Printer nameFont<%= t("views.right_panel.detail.printer_name") %><%= t("views.right_panel.detail.font") %> Page widthPage heightPrint copies<%= t("views.right_panel.detail.page_width") %><%= t("views.right_panel.detail.page_height") %><%= t("views.right_panel.detail.print_copies") %> Actions<%= t("views.right_panel.detail.actions") %>
        - + - + - + - + - + - + - + - + - + diff --git a/app/views/settings/accounts/edit.html.erb b/app/views/settings/accounts/edit.html.erb index d97b8659..96fca006 100755 --- a/app/views/settings/accounts/edit.html.erb +++ b/app/views/settings/accounts/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Account
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.account") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index 4b355d3c..5ffcbff5 100755 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Account
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.account") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -17,13 +17,13 @@
        Name<%= t("views.right_panel.detail.name") %> <%= @print_setting.name %>
        Unique code<%= t("views.right_panel.detail.unique_code") %> <%= @print_setting.unique_code %>
        Template<%= t("views.right_panel.detail.template") %> <%= @print_setting.template %>
        Printer name<%= t("views.right_panel.detail.printer_name") %> <%= @print_setting.printer_name %>
        Font<%= t("views.right_panel.detail.font") %> <%= @print_setting.font rescue '-' %>
        Api settings<%= t("views.right_panel.detail.api_settings") %> <%= @print_setting.api_settings %>
        Page width<%= t("views.right_panel.detail.page_width") %> <%= @print_setting.page_width %>
        Page height<%= t("views.right_panel.detail.page_height") %> <%= @print_setting.page_height %>
        Print copies<%= t("views.right_panel.detail.print_copies") %> <%= @print_setting.print_copies %>
        - - - - - - - + + + + + + + diff --git a/app/views/settings/accounts/new.html.erb b/app/views/settings/accounts/new.html.erb index 68fc6501..630ae543 100755 --- a/app/views/settings/accounts/new.html.erb +++ b/app/views/settings/accounts/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Account
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.account") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %> diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index 5b0ce07d..b51e0c61 100755 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -1,9 +1,9 @@
            -
          1. Home
            2. -
          2. Account
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.detail.account") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %> @@ -20,13 +20,13 @@
        TitleAccount TypeDiscountPointBonusRebateActions<%= t("views.right_panel.detail.title") %><%= t("views.right_panel.detail.account_type") %><%= t("views.right_panel.detail.discount") %><%= t("views.right_panel.detail.point") %><%= t("views.right_panel.detail.bonus") %><%= t("views.right_panel.detail.rebate") %><%= t("views.right_panel.detail.actions") %>
        - - + + - + - - + + @@ -63,8 +63,8 @@

        1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %>
        2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %>
        - 3) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %>
        - 4) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %>
        + 3) <%= t("views.right_panel.detail.can_get_points") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %>
        + 4) <%= t("views.right_panel.detail.can_rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %>
        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.account_txt") %>

        list <%= t("views.right_panel.header.button_lists") %>
        diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb index 5189a560..89c7491c 100755 --- a/app/views/settings/cashier_terminals/edit.html.erb +++ b/app/views/settings/cashier_terminals/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Terminals
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.cashier_terminal") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index fb7012a6..67ddacbe 100755 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Cashier Terminal
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.header.cashier_terminal") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -16,15 +16,15 @@
        TitleAccount type<%= t("views.right_panel.detail.title") %><%= t("views.right_panel.detail.account_type") %> Can get Points<%= t("views.right_panel.detail.can_get_points") %> Can rebateActions<%= t("views.right_panel.detail.can_rebate") %><%= t("views.right_panel.detail.actions") %>
        - - - - + + + + - - + + - + diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb index cdd9635e..cde2e8f6 100755 --- a/app/views/settings/cashier_terminals/new.html.erb +++ b/app/views/settings/cashier_terminals/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Cashier Terminals
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.cashier_terminal") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb index 8f6191cb..84d454f6 100755 --- a/app/views/settings/cashier_terminals/show.html.erb +++ b/app/views/settings/cashier_terminals/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Cashier Terminals
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.header.cashier_terminal") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> @@ -17,64 +17,64 @@

            Cashier Terminal

        NameActiveLogin?Auto print<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.active") %><%= t("views.right_panel.detail.login") %>?<%= t("views.right_panel.detail.auto_print") %> Show taxShow cashier<%= t("views.right_panel.detail.show_tax") %><%= t("views.right_panel.detail.show_cashier") %> Actions<%= t("views.right_panel.detail.actions") %>
        - + - + - + - + - + - + - + - + - + - + - + - + @@ -104,17 +104,16 @@

        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %>
        - 3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %>
        - 4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %>
        - 5) <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %>
        - 6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        - 7) <%= t("views.right_panel.detail.header") %> - <%= t("views.right_panel.detail.header_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        - 8) <%= t("views.right_panel.detail.footer") %> - <%= t("views.right_panel.detail.footer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        - 9) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %>
        - 10) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %>
        - 11) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %>
        - 12) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %>
        - 13) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %>
        + 3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %>
        + 4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %>
        + 5) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        + 6) <%= t("views.right_panel.detail.header") %> - <%= t("views.right_panel.detail.header_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        + 7) <%= t("views.right_panel.detail.footer") %> - <%= t("views.right_panel.detail.footer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %>
        + 8) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %>
        + 9) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %>
        + 10) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %>
        + 11) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %>
        + 12) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %>

        list <%= t("views.right_panel.header.button_lists") %>

        diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb index 5a8701a5..2909aa6f 100755 --- a/app/views/settings/commissioners/edit.html.erb +++ b/app/views/settings/commissioners/edit.html.erb @@ -1,9 +1,9 @@

          -
        1. Home
          2. -
        2. Commissioner
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.commissioners") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index 2221be0f..caf87297 100755 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Commissioner
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("en.commissioners") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -16,13 +16,13 @@
        Name:<%= t("views.right_panel.detail.name") %>: <%= @settings_cashier_terminal.name %>
        Is active:<%= t("views.right_panel.detail.is_active") %>: <%= @settings_cashier_terminal.is_active %>
        Is currently login:<%= t("views.right_panel.detail.is_currently_login") %>: <%= @settings_cashier_terminal.is_currently_login %>
        Auto print receipt:<%= t("views.right_panel.detail.auto_print_receipt") %>: <%= @settings_cashier_terminal.auto_print_receipt %>
        Printer name:<%= t("views.right_panel.detail.printer_name") %>: <%= @settings_cashier_terminal.printer_name %>
        Header:<%= t("views.right_panel.detail.header") %>: <%= @settings_cashier_terminal.header %>
        Footer:<%= t("views.right_panel.detail.footer") %>: <%= @settings_cashier_terminal.footer %>
        Font:<%= t("views.right_panel.detail.font") %>: <%= @settings_cashier_terminal.font %>
        Font size:<%= t("views.right_panel.detail.font_size") %>: <%= @settings_cashier_terminal.font_size %>
        Show tax:<%= t("views.right_panel.detail.show_tax") %>: <%= @settings_cashier_terminal.show_tax %>
        Show cashier:<%= t("views.right_panel.detail.show_cashier") %>: <%= @settings_cashier_terminal.show_cashier %>
        Show guest info:<%= t("views.right_panel.detail.show_guest_info") %>: <%= @settings_cashier_terminal.show_guest_info %>
        - - - - - - - + + + + + + + @@ -52,7 +52,7 @@
        view_headline <%= t("views.right_panel.header.page_detail") %>

        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commissioner_txt") %>
        - 2) <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
        + 2) <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
        3) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.commission_type_txt") %>
        4) <%= t("views.right_panel.detail.joined_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.joined_date_txt") %>
        5) <%= t("views.right_panel.detail.resigned_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.resigned_date_txt") %>
        diff --git a/app/views/settings/commissioners/new.html.erb b/app/views/settings/commissioners/new.html.erb index bc50bdac..8d989cfb 100755 --- a/app/views/settings/commissioners/new.html.erb +++ b/app/views/settings/commissioners/new.html.erb @@ -1,8 +1,8 @@

          -
        1. Home
          2. -
        2. Commissioner
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.commissioners") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index 122f65ea..2bc0d39c 100755 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Commissioner
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("en.commissioners") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> @@ -30,31 +30,31 @@
        NameEmployee NameCommission typeJoined DateResigned DateActiveActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.commission_type") %><%= t("views.right_panel.detail.joined_date") %><%= t("views.right_panel.detail.resigned_date") %><%= t("views.right_panel.detail.active") %><%= t("views.right_panel.detail.actions") %>
        - + - + - + - + - + - + - + diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index 15bdf52a..a1a2368a 100755 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -7,7 +7,7 @@
        <%= f.label :product_code, 'Product' %> - <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %>
        + <%= f.collection_select :product_code, MenuItem.all.order('name asc'), :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %>
        <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %> <%= f.input :amount %> <%= f.input :is_active %> Active diff --git a/app/views/settings/commissions/edit.html.erb b/app/views/settings/commissions/edit.html.erb index 13abfa88..bf021e34 100755 --- a/app/views/settings/commissions/edit.html.erb +++ b/app/views/settings/commissions/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Commission
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.commissions") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb index d3d1cfff..4c1a4b44 100755 --- a/app/views/settings/commissions/index.html.erb +++ b/app/views/settings/commissions/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Commissions
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("en.commissions") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -17,11 +17,11 @@
        Name<%= t("views.right_panel.detail.name") %> <%= @commissioner.name %>
        Employee Name<%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %> <%= @commissioner.employee.name rescue '-' %>
        Commission Type<%= t("views.right_panel.detail.commission_type") %> <%= @commissioner.commission.menu_item.name rescue '-' %>
        Joined Date<%= t("views.right_panel.detail.joined_date") %> <%= @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %>
        Resigned Date<%= t("views.right_panel.detail.resigned_date") %> <%= @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %>
        Active<%= t("views.right_panel.detail.active") %> <%= @commissioner.is_active %>
        Created By<%= t("views.right_panel.detail.created_by") %> <%= Employee.find(@commissioner.created_by).name %>
        - - - - - + + + + + diff --git a/app/views/settings/commissions/new.html.erb b/app/views/settings/commissions/new.html.erb index d0928d4a..deae67ec 100755 --- a/app/views/settings/commissions/new.html.erb +++ b/app/views/settings/commissions/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Commission
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.commissions") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index 96fb8962..a74fbc0a 100755 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Commission
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("en.commissions") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> @@ -13,23 +13,23 @@
            -

            Commission

            +

            <%= t("en.commissions") %>

        Product NameCommission TypeAmountActiveActions<%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %><%= t("views.right_panel.detail.commission_type") %><%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.active") %><%= t("views.right_panel.detail.actions") %>
        - + - + - + - + diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb index ef45ddeb..ef8e6bfd 100755 --- a/app/views/settings/employees/edit.html.erb +++ b/app/views/settings/employees/edit.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Employees
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.employees") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index dd95daf7..7aeee2ec 100755 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Employee
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.employee") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -17,11 +17,11 @@
        Product Name<%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %> <%= @commission.menu_item.name rescue '-' %>
        Amount<%= t("views.right_panel.detail.amount") %> <%= @commission.amount %>
        Commission Type<%= t("views.right_panel.detail.commission_type") %> <%= @commission.commission_type %>
        Active<%= t("views.right_panel.detail.active") %> <%= @commission.is_active %>
        - - - - - + + + + + diff --git a/app/views/settings/employees/new.html.erb b/app/views/settings/employees/new.html.erb index f3c59410..1a12fc6b 100755 --- a/app/views/settings/employees/new.html.erb +++ b/app/views/settings/employees/new.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Employees
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.employees") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 40060a6d..a689767f 100755 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -9,9 +9,9 @@
        -->
          -
        1. Home
          2. -
        2. Employees
          3. -
        3. Details
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.employee") %>
          6. +
        6. <%= t("en.details") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> @@ -24,24 +24,24 @@
          -

          Employee

          +

          <%= t("views.right_panel.detail.employee") %>

        NameRoleCreated AtUpdated AtActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.role") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.updated_at") %><%= t("views.right_panel.detail.actions") %>
        - + - + - + - + diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index b5ba601e..8bca575f 100755 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Item Sets
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.item_set") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_item_sets_path %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index be5a708f..48bd9982 100755 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Item Set
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.item_set") %>
            5. <%= link_to t("views.btn.back"), dashboard_path %> @@ -14,6 +14,7 @@
              +
            • <%= link_to (t :accounts), settings_accounts_path %>
            • <%= link_to 'Menu ', settings_menus_path %>
            • <%= link_to 'Menu Categories', settings_menu_categories_path %>
              • @@ -31,11 +32,11 @@
        Name<%= t("views.right_panel.detail.name") %> <%= @employee.name %>
        Role<%= t("views.right_panel.detail.role") %> <%= @employee.role %>
        Created At<%= t("views.right_panel.detail.created_at") %> <%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
        Updated At<%= t("views.right_panel.detail.updated_at") %> <%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
        - - - - - + + + + + @@ -77,6 +78,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index 51eb0bfb..fd43dbc5 100755 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Item Sets
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.item_set") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index 3ec97631..21be5639 100755 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -1,9 +1,9 @@
            -
          1. Home
            2. -
          2. Item Set
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.detail.item_set") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t("views.btn.back"), settings_item_sets_path %> @@ -17,19 +17,19 @@
        - + - + - + - + diff --git a/app/views/settings/menu_categories/edit.html.erb b/app/views/settings/menu_categories/edit.html.erb index b50e3626..59e3badb 100755 --- a/app/views/settings/menu_categories/edit.html.erb +++ b/app/views/settings/menu_categories/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Categories
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.menu_categories") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to 'Back', settings_menu_categories_path %> diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 88da26ee..870c19bc 100755 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Menu Category
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.menu_category") %>
            5. <%= link_to 'Back', settings_menus_path %> @@ -11,6 +11,7 @@
              +
            • <%= link_to (t :accounts), settings_accounts_path %>
            • <%= link_to 'Menu ', settings_menus_path %>
            • <%= link_to 'Menu Categories', settings_menu_categories_path %>
              • @@ -25,13 +26,13 @@
        NameAlt NameMin selectable qtyMax selectable qtyActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.min_selectable_qty") %><%= t("views.right_panel.detail.max_selectable_qty") %><%= t("views.right_panel.detail.actions") %>
        Name:<%= t("views.right_panel.detail.name") %>: <%= @settings_item_set.name %>
        Alt Name:<%= t("views.right_panel.detail.alt_name") %>: <%= @settings_item_set.alt_name %>
        Min selectable qty:<%= t("views.right_panel.detail.min_selectable_qty") %>: <%= @settings_item_set.min_selectable_qty %>
        Max selectable qty:<%= t("views.right_panel.detail.max_selectable_qty") %>: <%= @settings_item_set.max_selectable_qty %>
        - - - - - - - + + + + + + + @@ -74,11 +75,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/menu_categories/new.html.erb b/app/views/settings/menu_categories/new.html.erb index d569e488..21841a18 100755 --- a/app/views/settings/menu_categories/new.html.erb +++ b/app/views/settings/menu_categories/new.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Menu Categories
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.menu_categories") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to 'Back', settings_menu_categories_path %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index a1af51e1..7f37342b 100755 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Menu Category
            3. -
          3. Detail
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.detail.menu_category") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to 'Back', settings_menu_categories_path %> @@ -26,17 +26,17 @@
            -

            Menu Category

            +

            <%= t("views.right_panel.header.menu_category") %>

        MenuNameAlt nameIs AvailableOrder byParentActions<%= t("views.right_panel.detail.menu") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.is_available") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.parent") %><%= t("views.right_panel.detail.actions") %>
        - - - - + + + + - - + + @@ -67,7 +67,7 @@
        -

        Menu Items +

        <%= t("views.right_panel.header.menu_items") %> <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> @@ -76,14 +76,14 @@

        MenuNameAlt nameAvailable<%= t("views.right_panel.detail.menu") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.is_available") %> Created AtActions<%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - - + + + + + - - + + <% settings_menu_items = @settings_menu_category.menu_items %> @@ -157,11 +157,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/menu_item_attributes/edit.html.erb b/app/views/settings/menu_item_attributes/edit.html.erb index 6ed4355f..d0b78fce 100755 --- a/app/views/settings/menu_item_attributes/edit.html.erb +++ b/app/views/settings/menu_item_attributes/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Item Attributes
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_attributes") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to 'Back', settings_menu_item_attributes_path %> diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index 20cefaba..924cdfb3 100755 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Menu Item Attributes
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.header.menu_item_attributes") %>
            5. <%= link_to 'Back', dashboard_path %> @@ -12,6 +12,7 @@
              +
            • <%= link_to (t :accounts), settings_accounts_path %>
            • <%= link_to 'Menu ', settings_menus_path %>
            • <%= link_to 'Menu Categories', settings_menu_categories_path %>
              • @@ -24,7 +25,7 @@
              -

              Menu Item Attributes +

              <%= t("views.right_panel.header.menu_item_attributes") %> <%= link_to t("views.btn.new"),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>

              @@ -32,10 +33,10 @@
        Item codeNameAlt nameTypeParent Item<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.parent_item") %> Created atActions<%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - + + + + @@ -69,7 +70,7 @@
        view_headline <%= t("views.right_panel.header.page_detail") %>

        - 1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> / <%= t("views.right_panel.detail.type_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 1) <%= t("views.right_panel.detail.attribute_type") %> - <%= t("views.right_panel.detail.type_txt") %> / <%= t("views.right_panel.detail.type_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
        3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.value_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.data_txt") %>
        @@ -83,11 +84,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/menu_item_attributes/new.html.erb b/app/views/settings/menu_item_attributes/new.html.erb index 6de1a2ff..6c4cce44 100755 --- a/app/views/settings/menu_item_attributes/new.html.erb +++ b/app/views/settings/menu_item_attributes/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Item Attributes
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_attributes") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to 'Back', settings_menu_item_attributes_path %> diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb index 6e30613f..5f356a4d 100755 --- a/app/views/settings/menu_item_attributes/show.html.erb +++ b/app/views/settings/menu_item_attributes/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Menu Item Attributes
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.header.menu_item_attributes") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to 'Back', settings_menu_item_attributes_path %> @@ -16,10 +16,10 @@
        Attribute typeNameValueActions<%= t("views.right_panel.detail.attribute_type") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.value") %><%= t("views.right_panel.detail.actions") %>
        - - - - + + + + diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 739be50f..5b312432 100755 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Menu Item
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_instances") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb index 84f24627..05be23d2 100755 --- a/app/views/settings/menu_item_instances/index.html.erb +++ b/app/views/settings/menu_item_instances/index.html.erb @@ -1,9 +1,9 @@
          -

          Menu Category

          +

          <%= t("views.right_panel.header.menu_category") %>

        NameValueCreated AtActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.value") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - - - + + + + + + @@ -49,7 +49,7 @@
        -

        Menu Items +

        <%= t("views.right_panel.header.menu_items") %> <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> @@ -59,15 +59,14 @@

        MenuNameAlt nameOrder byParentActions<%= t("views.right_panel.detail.menu") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.parent") %><%= t("views.right_panel.detail.actions") %>
        - - - - - - - - - + + + + + + + + diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index 55dc3ac5..9a939db6 100755 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Item
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_instances") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index aa8cc544..17718e38 100755 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -12,9 +12,9 @@
        -->
          -
        1. Home
          2. -
        2. Menu Item Instances
          3. -
        3. Detail
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item") %>
          6. +
        6. <%= t("en.details") %>
          7. <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> @@ -26,32 +26,32 @@
          -

          Menu Item Instance

          +

          <%= t("views.right_panel.header.menu_item_instances") %>

        Item codeNameAlt nameTypeParent ItemCreated byCreated at<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.parent_item") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - + - + - + - + - + - + - + - + diff --git a/app/views/settings/menu_item_options/edit.html.erb b/app/views/settings/menu_item_options/edit.html.erb index b038e3d9..ec7692ec 100755 --- a/app/views/settings/menu_item_options/edit.html.erb +++ b/app/views/settings/menu_item_options/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Item Options
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_options") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to 'Back', settings_menu_item_options_path %> diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index 39e838c8..5345bcdd 100755 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Menu Item Options
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.header.menu_item_options") %>
            5. <%= link_to 'Back', dashboard_path %> @@ -26,17 +26,17 @@
            -

            Menu Item Options +

            <%= t("views.right_panel.header.menu_item_options") %> <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>

        Item Instance code
        <%= t("views.right_panel.detail.item_instance_code") %> <%= @settings_menu_item_instances.item_instance_code %>
        Name
        <%= t("views.right_panel.detail.name") %> <%= @settings_menu_item_instances.item_instance_name rescue "-" %>
        Price
        <%= t("views.right_panel.detail.price") %> <%= @settings_menu_item_instances.price %>
        On Promotion
        <%= t("views.right_panel.detail.is_on_promotion") %> <%= @settings_menu_item_instances.is_on_promotion %>
        Promotion Price
        <%= t("views.right_panel.detail.promotion_price") %> <%= @settings_menu_item_instances.promotion_price %>
        Available
        <%= t("views.right_panel.detail.is_available") %> <%= @settings_menu_item_instances.is_available %>
        Is Default
        <%= t("views.right_panel.detail.is_default") %> <%= @settings_menu_item_instances.is_default %>
        Created At
        <%= t("views.right_panel.detail.created_at") %> <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
        - - - - + + + + @@ -74,11 +74,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/menu_item_options/new.html.erb b/app/views/settings/menu_item_options/new.html.erb index b038e3d9..ce0aed01 100755 --- a/app/views/settings/menu_item_options/new.html.erb +++ b/app/views/settings/menu_item_options/new.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Menu Item Options
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.menu_item_options") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to 'Back', settings_menu_item_options_path %> diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 5fd7bc0f..170f8d75 100755 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -1,9 +1,9 @@
            -
          1. Home
            2. -
          2. Menu Item Options
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.header.menu_item_options") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to 'Back', settings_menu_item_options_path %> @@ -18,11 +18,11 @@
        TypeNameValueActions<%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.value") %><%= t("views.right_panel.detail.actions") %>
        - - - - - + + + + + diff --git a/app/views/settings/menus/edit.html.erb b/app/views/settings/menus/edit.html.erb index 280116a6..786c729c 100755 --- a/app/views/settings/menus/edit.html.erb +++ b/app/views/settings/menus/edit.html.erb @@ -11,9 +11,9 @@
          -
        1. Home
          2. -
        2. Menus
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.menus") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to 'Back', settings_menus_path %> diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index b9139d41..99b678ef 100755 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Menus
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("en.menus") %>
            5. <%= link_to 'Back', dashboard_path %> @@ -30,14 +30,14 @@
        TypeNameValueCreated AtActions<%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.value") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - + + + + - + @@ -81,11 +81,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/menus/new.html.erb b/app/views/settings/menus/new.html.erb index 1e49dcaa..2466f24a 100755 --- a/app/views/settings/menus/new.html.erb +++ b/app/views/settings/menus/new.html.erb @@ -12,9 +12,9 @@ -->
          -
        1. Home
          2. -
        2. Menus
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.menus") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to 'Back', settings_menus_path %> diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index bd86f4f3..e7f45f5b 100755 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Menus
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("en.menus") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to 'Back', settings_menus_path %> @@ -25,17 +25,17 @@
            -

            Menu

            +

            <%= t("views.right_panel.header.menu") %>

        NameValid DaysValid FromValid To<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.valid_days") %><%= t("views.right_panel.detail.valid_from") %><%= t("views.right_panel.detail.valid_to") %> Actions<%= t("views.right_panel.detail.actions") %>
        - - - - - - - + + + + + + + @@ -64,7 +64,7 @@
        -

        Menu Categories +

        <%= t("views.right_panel.header.menu_categories") %> <%= link_to t("views.btn.new"),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %> @@ -73,12 +73,12 @@

        NameValid DaysValid FromValid ToCreated ByCreated AtActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.valid_days") %><%= t("views.right_panel.detail.valid_from") %><%= t("views.right_panel.detail.valid_to") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - - - + + + + + + @@ -124,7 +124,8 @@ 2) <%= t("views.right_panel.detail.sub_cat_count") %> - <%= t("views.right_panel.detail.number_of") %> <%= t("views.right_panel.detail.sub_categories_txt") %>
        3) <%= t("views.right_panel.detail.items_count") %> - <%= t("views.right_panel.detail.number_of") %> <%= t("views.right_panel.detail.items") %>
        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.menu_categories_txt") %>

        list <%= t("views.right_panel.header.button_lists") %>

        @@ -136,11 +137,12 @@

        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
        - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
        + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
        + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
        + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
        + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
        + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
        + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

        diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 432b12f3..529020fb 100755 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Order Queue Stations
          3. +
        3. <%= t("views.right_panel.button.home") %>
          4. +
        4. <%= t("views.right_panel.header.order_queue_stations") %>
          5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -20,17 +20,17 @@
        NameSub-Cat CountItems CountOrder ByCreated AtActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.sub_cat_count") %><%= t("views.right_panel.detail.items_count") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
        - - - - - + + + + + - + - + - + diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 7fb8a337..0617476a 100755 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Order Queue Stations
          3. -
        3. Detail
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.header.order_queue_stations") %>
          6. +
        6. <%= t("en.details") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %> @@ -19,43 +19,43 @@
        - + - + - + - + - + - + - + - + - + - + diff --git a/app/views/settings/payment_method_settings/edit.html.erb b/app/views/settings/payment_method_settings/edit.html.erb index 993f6ae7..4d7e646c 100755 --- a/app/views/settings/payment_method_settings/edit.html.erb +++ b/app/views/settings/payment_method_settings/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Payment Method Setting
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.payment_methods") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.ack', :default => t("views.back")), settings_payment_method_settings_path %> diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb index a793c676..b489ab5d 100755 --- a/app/views/settings/payment_method_settings/index.html.erb +++ b/app/views/settings/payment_method_settings/index.html.erb @@ -1,7 +1,7 @@
            -
          1. Home
            2. -
          2. Payment Method
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("en.payment_methods") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -19,13 +19,13 @@
        Station namePrinter nameIs activeAuto PrintPrint copy<%= t("views.right_panel.detail.station_name") %><%= t("views.right_panel.detail.printer_name") %><%= t("views.right_panel.detail.is_active") %><%= t("views.right_panel.detail.auto_print") %><%= t("views.right_panel.detail.print_copy") %> Alternate name<%= t("views.right_panel.detail.alternate_name") %> Created At<%= t("views.right_panel.detail.created_at") %> Actions<%= t("views.right_panel.detail.actions") %>
        Station name<%= t("views.right_panel.detail.station_name") %> <%= @settings_order_queue_station.station_name %>
        Is active<%= t("views.right_panel.detail.is_active") %> <%= @settings_order_queue_station.is_active %>
        Auto Print<%= t("views.right_panel.detail.auto_print") %> <%= @settings_order_queue_station.auto_print %>
        Processing items<%= t("views.right_panel.detail.processing_items") %> <%= JSON.parse(@settings_order_queue_station.processing_items).count %>
        Print copy<%= t("views.right_panel.detail.print_copy") %> <%= @settings_order_queue_station.print_copy %>
        Printer name<%= t("views.right_panel.detail.printer_name") %> <%= @settings_order_queue_station.printer_name %>
        Font size<%= t("views.right_panel.detail.font_size") %> <%= @settings_order_queue_station.font_size %>
        Cut per item<%= t("views.right_panel.detail.cut_per_print") %> <%= @settings_order_queue_station.cut_per_item %>
        Use alternate name<%= t("views.right_panel.detail.alternate_name") %> <%= @settings_order_queue_station.use_alternate_name %>
        Created by<%= t("views.right_panel.detail.created_by") %> <%= @settings_order_queue_station.created_by %>
        - - - - - + diff --git a/app/views/settings/payment_method_settings/new.html.erb b/app/views/settings/payment_method_settings/new.html.erb index d60a7454..a4255b4e 100755 --- a/app/views/settings/payment_method_settings/new.html.erb +++ b/app/views/settings/payment_method_settings/new.html.erb @@ -1,9 +1,9 @@
          -
        1. Home
          2. -
        2. Payment Method Setting
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.payment_methods") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.ack', :default => t("views.back")), settings_payment_method_settings_path %> diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb index b3798086..72ecafcf 100755 --- a/app/views/settings/payment_method_settings/show.html.erb +++ b/app/views/settings/payment_method_settings/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Payment Method Settings
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("en.payment_methods") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_payment_method_setting_path %> @@ -18,32 +18,32 @@ -->
        - + - + - + - + - + - + diff --git a/app/views/settings/products/edit.html.erb b/app/views/settings/products/edit.html.erb index f5d7a3de..a0b02edf 100755 --- a/app/views/settings/products/edit.html.erb +++ b/app/views/settings/products/edit.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Products
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.product") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb index a5d91b11..c5740b8d 100755 --- a/app/views/settings/products/index.html.erb +++ b/app/views/settings/products/index.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Product
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.product") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -19,15 +19,15 @@
        Payment methodIs activeGateway Comm typeGateway urlActions<%= t("views.right_panel.detail.actions") %>
        Payment method:<%= t("views.right_panel.detail.payment_method") %>: <%= @settings_payment_method_setting.payment_method %>
        Is active:<%= t("views.right_panel.detail.is_active") %>: <%= @settings_payment_method_setting.is_active %>
        Gateway communication type:<%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.comm_type") %>: <%= @settings_payment_method_setting.gateway_communication_type %>
        Gateway url:<%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %>: <%= @settings_payment_method_setting.gateway_url %>
        Auth token:<%= t("views.right_panel.detail.auth_token") %>: <%= @settings_payment_method_setting.auth_token %>
        Merchant account:<%= t("views.right_panel.detail.merchant_account") %>: <%= @settings_payment_method_setting.merchant_account_id %>
        - - - - + + + + - - - - + + + + @@ -61,7 +61,8 @@ 4) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        5) <%= t("views.right_panel.detail.description") %> - <%= t("views.right_panel.detail.description_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        6) <%= t("views.right_panel.detail.information") %> - <%= t("views.right_panel.detail.information_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        - 7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.taxable_txt") %>
        + 7) <%= t("views.right_panel.detail.taxable") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %>
        + 8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.taxable_txt") %>

        list <%= t("views.right_panel.header.button_lists") %>

        diff --git a/app/views/settings/products/new.html.erb b/app/views/settings/products/new.html.erb index a62701a0..5ba87f02 100755 --- a/app/views/settings/products/new.html.erb +++ b/app/views/settings/products/new.html.erb @@ -10,9 +10,9 @@ -->

          -
        1. Home
          2. -
        2. Products
          3. -
        3. New
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.product") %>
          6. +
        6. <%= t("views.btn.new") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb index cd5639ea..701faa91 100755 --- a/app/views/settings/products/show.html.erb +++ b/app/views/settings/products/show.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Products
            3. -
          3. Details
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("views.right_panel.detail.product") %>
            6. +
          6. <%= t("en.details") %>
            7. <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> @@ -14,19 +14,19 @@
            -

            Product

            +

            <%= t("views.right_panel.detail.product") %>

        Item CodeNameAlt NameUnit Price<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.unit_price") %> DescriptionInformationTaxableActions<%= t("views.right_panel.detail.description") %><%= t("views.right_panel.detail.information") %><%= t("views.right_panel.detail.taxable") %><%= t("views.right_panel.detail.actions") %>
        - - - - - - - - + + + + + + + + + <% end %> + + <% end %> + +
        Item code<%= @settings_product.item_code %>
        Name<%= @settings_product.name %>
        Alt name<%= @settings_product.alt_name %>
        Unit price<%= @settings_product.unit_price %>
        Image path<%= image_tag @settings_product.image_path, :size => '200x200'%>
        Description<%= @settings_product.description %>
        Information<%= @settings_product.information %>
        Taxable<%= @settings_product.taxable %>
        <%= t("views.right_panel.detail.item_code") %><%= @settings_product.item_code %>
        <%= t("views.right_panel.detail.name") %><%= @settings_product.name %>
        <%= t("views.right_panel.detail.alt_name") %><%= @settings_product.alt_name %>
        <%= t("views.right_panel.detail.unit_price") %><%= @settings_product.unit_price %>
        <%= t("views.right_panel.detail.product_image") %><%= image_tag @settings_product.image_path, :size => '200x200'%>
        <%= t("views.right_panel.detail.description") %><%= @settings_product.description %>
        <%= t("views.right_panel.detail.information") %><%= @settings_product.information %>
        <%= t("views.right_panel.detail.taxable") %><%= @settings_product.taxable %>
        <%= link_to t("views.btn.edit"), edit_settings_product_path(@settings_product),:class => 'btn btn-primary btn-sm waves-effect' %> @@ -58,7 +58,7 @@ 5) <%= t("views.right_panel.detail.product_image") %> - <%= t("views.right_panel.detail.image_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        6) <%= t("views.right_panel.detail.description") %> - <%= t("views.right_panel.detail.description_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        7) <%= t("views.right_panel.detail.information") %> - <%= t("views.right_panel.detail.information_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %>
        - 8) <%= t("views.right_panel.detail.is_taxable") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %>
        + 8) <%= t("views.right_panel.detail.taxable") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %>

        list <%= t("views.right_panel.header.button_lists") %>

        diff --git a/app/views/settings/promotions/edit.html.erb b/app/views/settings/promotions/edit.html.erb index 0ce73ac8..7b425108 100755 --- a/app/views/settings/promotions/edit.html.erb +++ b/app/views/settings/promotions/edit.html.erb @@ -1,9 +1,9 @@

          -
        1. Home
          2. -
        2. Promotion
          3. -
        3. Edit
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.promotion") %>
          6. +
        6. <%= t("views.btn.edit") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %> diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb index 02d7b5ad..54210902 100755 --- a/app/views/settings/promotions/index.html.erb +++ b/app/views/settings/promotions/index.html.erb @@ -1,8 +1,8 @@
            -
          1. Home
            2. -
          2. Promotion
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("views.right_panel.detail.promotion") %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -18,16 +18,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb index 55ddeb43..2d56ed2b 100755 --- a/app/views/settings/promotions/new.html.erb +++ b/app/views/settings/promotions/new.html.erb @@ -1,9 +1,9 @@
              -
            1. Home
              2. -
            2. Promotion
              3. -
            3. New
              4. +
            4. <%= t("views.right_panel.button.home") %>
              5. +
            5. <%= t("views.right_panel.detail.promotion") %>
              6. +
            6. <%= t("views.btn.new") %>
              7. <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %> diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb index f09d59e0..277a4ab0 100755 --- a/app/views/settings/promotions/show.html.erb +++ b/app/views/settings/promotions/show.html.erb @@ -1,8 +1,8 @@
                -
              1. Home
                2. -
              2. Promotions
                3. -
              3. Details
                4. +
              4. <%= t("views.right_panel.button.home") %>
                5. +
              5. <%= t("views.right_panel.detail.promotion") %>
                6. +
              6. <%= t("en.details") %>
                7. <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %> @@ -12,14 +12,14 @@
                -

                Promotion

                +

                <%= t("views.right_panel.detail.promotion") %>

            Promotion CodeStart DateEnd DateStart TimeEnd TimePromotion DayOriginal ProductCreated ByCreated AtActions<%= t("views.right_panel.detail.promotion_code") %><%= t("views.right_panel.detail.start_date") %><%= t("views.right_panel.detail.end_date") %><%= t("views.right_panel.detail.start_time") %><%= t("views.right_panel.detail.end_time") %><%= t("views.right_panel.detail.promotion_day") %><%= t("views.right_panel.detail.original_product") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
            - - - - - + + + + +
            Promotion code<%= @promotion.promo_code %>
            Promotion Start Date<%= @promotion.promo_start_date %>
            Promotion End Date<%= @promotion.promo_end_date %>
            Promotion Start Hour<%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-" %>
            Promotion Start Hour<%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %>
            <%= t("views.right_panel.detail.promotion_code") %><%= @promotion.promo_code %>
            <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_date") %><%= @promotion.promo_start_date %>
            <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_date") %><%= @promotion.promo_end_date %>
            <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_time") %><%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-" %>
            <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_time") %><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %>
            @@ -45,10 +45,10 @@
            view_headline <%= t("views.right_panel.header.page_detail") %>

            1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.promotion_code_txt") %> <%= t("views.right_panel.detail.promotion_txt2") %> <%= t("views.right_panel.detail.promotion_txt") %>
            - 2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            - 3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            - 4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            - 5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            + 2) <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            + 3) <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            + 4) <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>
            + 5) <%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %>

            list <%= t("views.right_panel.header.button_lists") %>

            diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index 762ed0d9..0bae716a 100755 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -11,9 +11,9 @@

          -->
            -
          1. Home
            2. -
          2. Menu Category
            3. -
          3. New
            4. +
          4. <%= t("views.right_panel.button.home") %>
            5. +
          5. <%= t("en.set_menu_item") %>
            6. +
          6. <%= t("views.btn.edit") %>
            7. <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %> diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index a8008306..d742b9ae 100755 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -11,8 +11,8 @@
          -->
            -
          1. Home
            2. -
          2. Menu Category
            3. +
          3. <%= t("views.right_panel.button.home") %>
            4. +
          4. <%= t("en.set_menu_item") %>
            5. <%= link_to 'Back', dashboard_path %> @@ -23,6 +23,7 @@
              +
            • <%= link_to (t :accounts), settings_accounts_path %>
            • <%= link_to 'Menu ', settings_menus_path %>
            • <%= link_to 'Menu Categories', settings_menu_categories_path %>
              • @@ -36,7 +37,7 @@
              -

              Menu Category +

              <%= t("views.right_panel.header.menu_category") %> <%= link_to t("views.btn.new"),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-lg float-right waves-effect"' %>

              @@ -44,12 +45,12 @@ - - - - - - + + + + + + @@ -69,7 +70,7 @@
              -

              Menu Items +

              <%= t("views.right_panel.header.menu_items") %> <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> @@ -79,15 +80,15 @@

              MenuNameAlt nameOrder byParentActions<%= t("views.right_panel.detail.menu") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.parent") %><%= t("views.right_panel.detail.actions") %>
              - - - - - + + + + + - + - + @@ -123,10 +124,51 @@
              - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
              <%= t("views.right_panel.header.menu_category") %>
              +
              view_headline <%= t("views.right_panel.header.page_detail") %>
              +

              + 1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
              + 2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
              + 3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              + 4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %>
              + 4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              + 5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              + 6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              +

              +
              list <%= t("views.right_panel.header.button_lists") %>
              +

              + 1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              + 2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              +

              +
              <%= t("views.right_panel.header.menu_items") %>
              +
              view_headline <%= t("views.right_panel.header.page_detail") %>
              +

              + 1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              + 2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
              + 3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              + 4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              + 5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %>
              + 6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              +

              +
              list <%= t("views.right_panel.header.button_lists") %>
              +

              + 1) <%= t("views.right_panel.button.new_simple_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %>
              + 2) <%= t("views.right_panel.button.new_set_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %>
              + 3) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              + 4) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
              +

              + ----------------------------------------------------------------- +
              list <%= t("views.right_panel.header.link_lists") %>
              +

              + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
              + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
              + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
              + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
              + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
              + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
              + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
              + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
              +

              diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb index 6227113e..9e7df713 100755 --- a/app/views/settings/set_menu_items/new.html.erb +++ b/app/views/settings/set_menu_items/new.html.erb @@ -16,9 +16,9 @@
                -
              1. Home
                2. -
              2. Menu Category
                3. -
              3. New
                4. +
              4. <%= t("views.right_panel.button.home") %>
                5. +
              5. <%= t("en.set_menu_item") %>
                6. +
              6. <%= t("views.btn.new") %>
                7. <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %> diff --git a/app/views/settings/simple_menu_items/edit.html.erb b/app/views/settings/simple_menu_items/edit.html.erb index cc6c310d..29104e93 100755 --- a/app/views/settings/simple_menu_items/edit.html.erb +++ b/app/views/settings/simple_menu_items/edit.html.erb @@ -12,9 +12,9 @@
                  -
                1. Home
                  2. -
                2. Menu Category
                  3. -
                3. Edit
                  4. +
                4. <%= t("views.right_panel.button.home") %>
                  5. +
                5. <%= t("en.simple_menu_item") %>
                  6. +
                6. <%= t("views.btn.edit") %>
                  7. <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %> diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 984f8d95..b66d636e 100755 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -11,8 +11,8 @@
                -->
                  -
                1. Home
                  2. -
                2. Menus Categories
                  3. +
                3. <%= t("views.right_panel.button.home") %>
                  4. +
                4. <%= t("views.right_panel.header.menu_items") %>
                  5. <%= link_to 'Back', dashboard_path %> @@ -24,6 +24,7 @@
                    +
                  • <%= link_to (t :accounts), settings_accounts_path %>
                  • <%= link_to 'Menu ', settings_menus_path %>
                  • <%= link_to 'Menu Categories', settings_menu_categories_path %>
                    • @@ -36,19 +37,19 @@
                    -

                    Menu Category +

                    <%= t("views.right_panel.header.menu_category") %> <%= link_to t("views.btn.new"),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm float-right waves-effect"' %>

              Item codeNameAlt nameTypeParent Item<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.parent_item") %> Created at<%= t("views.right_panel.detail.created_at") %>Actions<%= t("views.right_panel.detail.actions") %>
              - - - - - - + + + + + + @@ -66,8 +67,8 @@ @@ -79,7 +80,7 @@
              -

              Menu Items +

              <%= t("views.right_panel.header.menu_items") %> <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> @@ -87,14 +88,14 @@

              MenuNameAlt nameOrder byParentActions<%= t("views.right_panel.detail.menu") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.parent") %><%= t("views.right_panel.detail.actions") %>
              - - - - - + + + + + - - + + @@ -110,34 +111,75 @@ <% if settings_menu_item.type == "SimpleMenuItem" %> - + <% else %> - - <% end %> - - <% end %> - -
              Item codeNameAlt nameTypeParent Item<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.alt_name") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.parent_item") %> Created atActions<%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
              <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> -
              +
        -
      +
    -
    - <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> +
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> +
+
+
+
+
<%= t("views.right_panel.header.menu_category") %>
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+

+ 1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
+ 2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
+ 3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+ 4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %>
+ 4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+ 5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+ 6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+

+
list <%= t("views.right_panel.header.button_lists") %>
+

+ 1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+ 2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+

+
<%= t("views.right_panel.header.menu_items") %>
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+

+ 1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+ 2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
+ 3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+ 4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+ 5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %>
+ 6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+

+
list <%= t("views.right_panel.header.button_lists") %>
+

+ 1) <%= t("views.right_panel.button.new_simple_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %>
+ 2) <%= t("views.right_panel.button.new_set_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %>
+ 3) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+ 4) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %>
+

+ ----------------------------------------------------------------- +
list <%= t("views.right_panel.header.link_lists") %>
+

+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
+ 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
+ 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
+ 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
+ 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
+ 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
+ 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
+

-
-
-
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse -
-
-
-
\ No newline at end of file +
+
+ \ No newline at end of file diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index e9baecc3..3992c8c3 100755 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -19,9 +19,9 @@
    -
  1. Home
    2. -
  2. Menu Category
    3. -
  3. New
    4. +
  4. <%= t("views.right_panel.button.home") %>
    5. +
  5. <%= t("en.simple_menu_item") %>
    6. +
  6. <%= t("views.btn.new") %>
    7. <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 5251a56f..ffdd037d 100755 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -1,8 +1,8 @@
      -
    1. Home
      2. -
    2. Menu Category
      3. -
    3. Details
      4. +
    4. <%= t("views.right_panel.button.home") %>
      5. +
    5. <%= t("views.right_panel.header.menu_item") %>
      6. +
    6. <%= t("en.details") %>
      7. <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %> @@ -27,23 +27,23 @@
      -

      Menu Item

      +

      <%= t("views.right_panel.header.menu_item") %>

      - - + + - - + + - - + + @@ -79,7 +79,7 @@
      -

      Menu Item Instances +

      <%= t("views.right_panel.header.menu_item_instances") %> <%= link_to t("views.btn.new"),new_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %> @@ -90,14 +90,14 @@

      - - - - - + + + + + - + @@ -127,7 +127,7 @@
      -
      <%= t("views.right_panel.header.menu_items") %>
      +
      <%= t("views.right_panel.header.menu_item") %>
      view_headline <%= t("views.right_panel.header.page_detail") %>

      1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %>
      @@ -164,11 +164,12 @@

      1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
      2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %>
      - 3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
      - 4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
      - 5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
      - 6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
      - 7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>
      + 3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %>
      + 4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %>
      + 5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %>
      + 6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %>
      + 7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %>
      + 8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %>

      diff --git a/app/views/settings/tax_profiles/edit.html.erb b/app/views/settings/tax_profiles/edit.html.erb index 348318ca..94c532dd 100755 --- a/app/views/settings/tax_profiles/edit.html.erb +++ b/app/views/settings/tax_profiles/edit.html.erb @@ -10,9 +10,9 @@
      -->
        -
      1. Home
        2. -
      2. Tax Profiles
        3. -
      3. Edit
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t("en.tax_profile") %>
        6. +
      6. <%= t("views.btn.edit") %>
        7. <%= link_to 'Back', settings_tax_profiles_path %> diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb index b679860e..fdfc0895 100755 --- a/app/views/settings/tax_profiles/index.html.erb +++ b/app/views/settings/tax_profiles/index.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Settings
          3. -
        3. Tax Profiles
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.settings") %>
          6. +
        6. <%= t("en.tax_profile") %>
          7. <%= link_to 'Back', dashboard_path %> @@ -17,12 +17,12 @@
      Item codeName<%= t("views.right_panel.detail.item_code") %><%= t("views.right_panel.detail.name") %> TypeAccount<%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.account") %> Created AtActions<%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>
      Instance CodeInstances NameItem AttributesPricePromotion<%= t("views.right_panel.detail.instance_code") %><%= t("views.right_panel.detail.instance_name") %><%= t("views.right_panel.detail.item_attributes") %><%= t("views.right_panel.detail.price") %><%= t("views.right_panel.detail.promotion") %> Actions<%= t("views.right_panel.detail.actions") %>
      - - - - - - + + + + + + diff --git a/app/views/settings/tax_profiles/new.html.erb b/app/views/settings/tax_profiles/new.html.erb index a5f3663e..a5d4fc4c 100755 --- a/app/views/settings/tax_profiles/new.html.erb +++ b/app/views/settings/tax_profiles/new.html.erb @@ -1,9 +1,9 @@
        -
      1. Home
        2. -
      2. Tax Profiles
        3. -
      3. New
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t("en.tax_profile") %>
        6. +
      6. <%= t("views.btn.new") %>
        7. <%= link_to 'Back', settings_tax_profiles_path %> diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb index 02a12256..821f16fc 100755 --- a/app/views/settings/tax_profiles/show.html.erb +++ b/app/views/settings/tax_profiles/show.html.erb @@ -1,8 +1,8 @@
          -
        1. Home
          2. -
        2. Tax Profiles
          3. -
        3. Details
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("en.tax_profile") %>
          6. +
        6. <%= t("en.details") %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %> @@ -13,30 +13,30 @@
          -

          Tax Profiles

          +

          <%= t("en.tax_profile") %>

      NameRateInclusiveOrder byCreated byActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.rate") %><%= t("views.right_panel.detail.inclusive") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.actions") %>
      - + - + - + - + - + diff --git a/app/views/settings/zones/edit.html.erb b/app/views/settings/zones/edit.html.erb index 8e7fa035..403d75f3 100755 --- a/app/views/settings/zones/edit.html.erb +++ b/app/views/settings/zones/edit.html.erb @@ -1,9 +1,9 @@
      Name:<%= t("views.right_panel.detail.name") %>: <%= @settings_tax_profile.name %>
      Rate:<%= t("views.right_panel.detail.rate") %>: <%= @settings_tax_profile.rate %>
      Inclusive:<%= t("views.right_panel.detail.inclusive") %>: <%= @settings_tax_profile.inclusive %>
      Order by:<%= t("views.right_panel.detail.order_by") %>: <%= @settings_tax_profile.order_by %>
      Created by:<%= t("views.right_panel.detail.created_by") %>: <%= @settings_tax_profile.created_by %>
      - - - - + + + + diff --git a/app/views/settings/zones/new.html.erb b/app/views/settings/zones/new.html.erb index c785c14b..33babbb6 100755 --- a/app/views/settings/zones/new.html.erb +++ b/app/views/settings/zones/new.html.erb @@ -1,8 +1,8 @@
      NameIs activeCreated byActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.is_active") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.actions") %>
      - - - - + + + + @@ -54,7 +54,7 @@
      -

      Dining Facilities +

      <%= t("views.right_panel.header.dining_facilities") %> <%= link_to "New Table",new_settings_zone_table_path(@settings_zone),:class => 'btn btn-success btn-sm waves-effect' %> <%= link_to "New Room",new_settings_zone_room_path(@settings_zone),:class => 'btn btn-success btn-sm waves-effect' %> @@ -63,13 +63,13 @@

      NameIs activeCreated byActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.is_active") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.actions") %>
      - - - - - - - + + + + + + + diff --git a/config/locales/en.yml b/config/locales/en.yml index 1fb88713..82a3356d 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -41,6 +41,8 @@ en: tax_profile: "Tax Profile" payment_methods: "Payment Methods" accounts: "Accounts" + details: "Details" + menus: "Menus" views: btn: @@ -113,8 +115,14 @@ en: menu: "Menu" menu_categories: "Menu Categories" menu_category: "Menu Category" + menu_item: "Menu Item" menu_items: "Menu Items" menu_item_instances: "Menu Item Instances" + menu_item_attributes: "Menu Item Attributes" + menu_item_options: "Menu Item Options" + order_queue_stations: "Order Queue Stations" + cashier_terminal: "Cashier Terminal" + print_settings: "Print Settings" button: new: "NEW" create: "CREATE" @@ -177,6 +185,7 @@ en: item_attributes: "Item attributes" item_options: "Item options" menu_item_image: "Menu Item Image" + item_set: "Item Set" item_sets: "Item sets" instance_code: "Instance Code" instance_name: "Instance Name" @@ -259,6 +268,10 @@ en: queue_no: "Queue no" contacct_no: "Contact no" remark: "Remark" + can_get_points: "Can get Points" + can_rebate: "Can rebate" + is_available: "Is available" + attribute_type: "Attribute type" code_txt: "code " charge_txt: "charge" @@ -406,6 +419,7 @@ en: queue_no_txt: "queue no" contacct_no_txt: "contact no" remark_txt: "remark" + accounts_txt: "accounts" assign_txt: "to assign " remove_txt: "to remove "
      NameTypeSeaterIs ActiveCreated ByCreated AtActions<%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.seater") %><%= t("views.right_panel.detail.is_active") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.created_at") %><%= t("views.right_panel.detail.actions") %>