diff --git a/app/views/crm/customers/edit.html.erb b/app/views/crm/customers/edit.html.erb index 8541aa0d..1fdf9618 100644 --- a/app/views/crm/customers/edit.html.erb +++ b/app/views/crm/customers/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', crm_customer: @crm_customer %> -<%= link_to 'Show', @crm_customers_path %> | +<%= link_to t("views.btn.show"), @crm_customers_path %> | <%= link_to 'Back', crm_customers_path %> diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 0c38fbf5..fcea1c60 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -86,7 +86,7 @@ <%= crm_customer.card_no rescue '-' %> <%= crm_customer.contact_no %> <%= crm_customer.email %> - <%= link_to 'Show', crm_customer_path(crm_customer) %> + <%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %> diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 30599acd..12714fc0 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -49,7 +49,7 @@
- <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block' %> + <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block' %>
diff --git a/app/views/crm/dining_queues/index_bk.html.erb b/app/views/crm/dining_queues/index_bk.html.erb index 7050885d..a359d94f 100644 --- a/app/views/crm/dining_queues/index_bk.html.erb +++ b/app/views/crm/dining_queues/index_bk.html.erb @@ -3,7 +3,7 @@
  • Home
  • Queue
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %>
    diff --git a/app/views/crm/dining_queues/show.html.erb b/app/views/crm/dining_queues/show.html.erb index 5e52a611..46f2963e 100644 --- a/app/views/crm/dining_queues/show.html.erb +++ b/app/views/crm/dining_queues/show.html.erb @@ -15,5 +15,5 @@ <%= @crm_dining_queue.queue_no %>

    -<%= link_to 'Edit', edit_crm_dining_queue_path(@crm_dining_queue) %> | +<%= link_to t("views.btn.edit"), edit_crm_dining_queue_path(@crm_dining_queue) %> | <%= link_to 'Back', crm_dining_queues_path %> diff --git a/app/views/inventory/inventory_definitions/index.html.erb b/app/views/inventory/inventory_definitions/index.html.erb index 6b27f54a..e13d1359 100644 --- a/app/views/inventory/inventory_definitions/index.html.erb +++ b/app/views/inventory/inventory_definitions/index.html.erb @@ -13,9 +13,9 @@ <% @inventory_definitions.each do |inventory_definition| %> - <%= link_to 'Show', inventory_definition %> - <%= link_to 'Edit', edit_inventory_definition_path(inventory_definition) %> - <%= link_to 'Destroy', inventory_definition, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), inventory_definition %> + <%= link_to t("views.btn.edit"), edit_inventory_definition_path(inventory_definition) %> + <%= link_to t("views.btn.delete"), inventory_definition, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/inventory/inventory_definitions/show.html.erb b/app/views/inventory/inventory_definitions/show.html.erb index 5d860127..c8eab886 100644 --- a/app/views/inventory/inventory_definitions/show.html.erb +++ b/app/views/inventory/inventory_definitions/show.html.erb @@ -1,4 +1,4 @@

    <%= notice %>

    -<%= link_to 'Edit', edit_inventory_definition_path(@inventory_definition) %> | +<%= link_to t("views.btn.edit"), edit_inventory_definition_path(@inventory_definition) %> | <%= link_to 'Back', inventory_definitions_path %> diff --git a/app/views/inventory/stock_check_items/edit.html.erb b/app/views/inventory/stock_check_items/edit.html.erb index 18f9d7fa..10f0062a 100644 --- a/app/views/inventory/stock_check_items/edit.html.erb +++ b/app/views/inventory/stock_check_items/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', stock_check_item: @stock_check_item %> -<%= link_to 'Show', @stock_check_item %> | +<%= link_to t("views.btn.show"), @stock_check_item %> | <%= link_to 'Back', stock_check_items_path %> diff --git a/app/views/inventory/stock_check_items/index.html.erb b/app/views/inventory/stock_check_items/index.html.erb index c0f3c403..76953e65 100644 --- a/app/views/inventory/stock_check_items/index.html.erb +++ b/app/views/inventory/stock_check_items/index.html.erb @@ -12,9 +12,9 @@ <% @stock_check_items.each do |stock_check_item| %> - <%= link_to 'Show', stock_check_item %> - <%= link_to 'Edit', edit_stock_check_item_path(stock_check_item) %> - <%= link_to 'Destroy', stock_check_item, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), stock_check_item %> + <%= link_to t("views.btn.edit"), edit_stock_check_item_path(stock_check_item) %> + <%= link_to t("views.btn.delete"), stock_check_item, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/inventory/stock_check_items/show.html.erb b/app/views/inventory/stock_check_items/show.html.erb index 2fe07fac..bdc1ec89 100644 --- a/app/views/inventory/stock_check_items/show.html.erb +++ b/app/views/inventory/stock_check_items/show.html.erb @@ -1,4 +1,4 @@

    <%= notice %>

    -<%= link_to 'Edit', edit_stock_check_item_path(@stock_check_item) %> | +<%= link_to t("views.btn.edit"), edit_stock_check_item_path(@stock_check_item) %> | <%= link_to 'Back', stock_check_items_path %> diff --git a/app/views/inventory/stock_journals/edit.html.erb b/app/views/inventory/stock_journals/edit.html.erb index 1b02d496..24f85a4b 100644 --- a/app/views/inventory/stock_journals/edit.html.erb +++ b/app/views/inventory/stock_journals/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', stock_journal: @stock_journal %> -<%= link_to 'Show', @stock_journal %> | +<%= link_to t("views.btn.show"), @stock_journal %> | <%= link_to 'Back', stock_journals_path %> diff --git a/app/views/inventory/stock_journals/index.html.erb b/app/views/inventory/stock_journals/index.html.erb index dde6e05f..485cd2ee 100644 --- a/app/views/inventory/stock_journals/index.html.erb +++ b/app/views/inventory/stock_journals/index.html.erb @@ -12,9 +12,9 @@ <% @stock_journals.each do |stock_journal| %> - <%= link_to 'Show', stock_journal %> - <%= link_to 'Edit', edit_stock_journal_path(stock_journal) %> - <%= link_to 'Destroy', stock_journal, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), stock_journal %> + <%= link_to t("views.btn.edit"), edit_stock_journal_path(stock_journal) %> + <%= link_to t("views.btn.delete"), stock_journal, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/inventory/stock_journals/show.html.erb b/app/views/inventory/stock_journals/show.html.erb index 63053af9..f4fe2f69 100644 --- a/app/views/inventory/stock_journals/show.html.erb +++ b/app/views/inventory/stock_journals/show.html.erb @@ -1,4 +1,4 @@

    <%= notice %>

    -<%= link_to 'Edit', edit_stock_journal_path(@stock_journal) %> | +<%= link_to t("views.btn.edit"), edit_stock_journal_path(@stock_journal) %> | <%= link_to 'Back', stock_journals_path %> diff --git a/app/views/origami/in_duties/index.html.erb b/app/views/origami/in_duties/index.html.erb index abefb1ea..91adade2 100644 --- a/app/views/origami/in_duties/index.html.erb +++ b/app/views/origami/in_duties/index.html.erb @@ -23,7 +23,7 @@ <%= in_duty.commissioner.name rescue '-' %> <%= in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> <%= in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> - <%= link_to 'Destroy', origami_destroy_in_duty_path(in_duty.dining_facility.id, in_duty), method: :delete, data: {confirm: 'Are you sure?'} %> + <%= link_to t("views.btn.delete"), origami_destroy_in_duty_path(in_duty.dining_facility.id, in_duty), method: :delete, data: {confirm: 'Are you sure?'} %> <% end %> @@ -35,7 +35,7 @@ <%= render 'form', in_duty: @in_duty, table: @table %> - <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_duty_path, :class => 'btn bg-blue' %> + <%= link_to t("views.btn.new"), new_origami_in_duty_path, :class => 'btn bg-blue' %> diff --git a/app/views/origami/in_duties/show.html.erb b/app/views/origami/in_duties/show.html.erb index 40eb15f9..3a0eb2f9 100644 --- a/app/views/origami/in_duties/show.html.erb +++ b/app/views/origami/in_duties/show.html.erb @@ -35,8 +35,8 @@ <%= link_to 'Back', origami_in_duties_path, class: 'btn btn-success' %> - <%= link_to 'Edit', edit_origami_in_duty_path(@in_duty), class: 'btn btn-info' %> - <%= link_to 'Destroy', origami_in_duty_path(@in_duty), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %> + <%= link_to t("views.btn.edit"), edit_origami_in_duty_path(@in_duty), class: 'btn btn-info' %> + <%= link_to t("views.btn.delete"), origami_in_duty_path(@in_duty), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %> diff --git a/app/views/origami/product_commissions/edit.html.erb b/app/views/origami/product_commissions/edit.html.erb index 021c55c0..321225e0 100644 --- a/app/views/origami/product_commissions/edit.html.erb +++ b/app/views/origami/product_commissions/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', product_commission: @product_commission %> -<%= link_to 'Show', @product_commission %> | +<%= link_to t("views.btn.show"), @product_commission %> | <%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/index.html.erb b/app/views/origami/product_commissions/index.html.erb index d64dc18f..82622d61 100644 --- a/app/views/origami/product_commissions/index.html.erb +++ b/app/views/origami/product_commissions/index.html.erb @@ -12,9 +12,9 @@ <% @product_commissions.each do |product_commission| %> - <%= link_to 'Show', product_commission %> - <%= link_to 'Edit', edit_product_commission_path(product_commission) %> - <%= link_to 'Destroy', product_commission, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), product_commission %> + <%= link_to t("views.btn.edit"), edit_product_commission_path(product_commission) %> + <%= link_to t("views.btn.delete"), product_commission, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/origami/product_commissions/show.html.erb b/app/views/origami/product_commissions/show.html.erb index 054447a1..ca5a3e1d 100644 --- a/app/views/origami/product_commissions/show.html.erb +++ b/app/views/origami/product_commissions/show.html.erb @@ -1,4 +1,4 @@

    <%= notice %>

    -<%= link_to 'Edit', edit_product_commission_path(@product_commission) %> | +<%= link_to t("views.btn.edit"), edit_product_commission_path(@product_commission) %> | <%= link_to 'Back', product_commissions_path %> diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index a66e3f34..6379e45c 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Print Settings
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_print_setting_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-sm' %> @@ -45,8 +45,8 @@ <%= print_setting.precision %> <%= print_setting.delimiter %> <%= print_setting.heading_space %> - <%= link_to 'Show', print_setting %> | <%= link_to 'Edit', edit_print_setting_path(print_setting) %> - + <%= link_to t("views.btn.show"), print_setting %> | <%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting) %> + <% end %> diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 79f4d8e9..124a3d94 100644 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -6,7 +6,7 @@
  • - <%= link_to 'Edit', edit_print_setting_path(@print_setting) %> | + <%= link_to t("views.btn.edit"), edit_print_setting_path(@print_setting) %> | <%= link_to 'Back', print_settings_path %>
    • diff --git a/app/views/settings/accounts/edit.html.erb b/app/views/settings/accounts/edit.html.erb index 3ac0955e..9c116ea9 100644 --- a/app/views/settings/accounts/edit.html.erb +++ b/app/views/settings/accounts/edit.html.erb @@ -14,7 +14,7 @@
  • Account
  • Edit
    • - <%= link_to 'Back', settings_accounts_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index d71d7e29..fb48d00f 100644 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -4,12 +4,12 @@
  • Home
  • Account
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>

    @@ -40,8 +40,8 @@ <%= account.bonus %> <%= account.rebate %> - <%= link_to 'Edit', edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/settings/accounts/new.html.erb b/app/views/settings/accounts/new.html.erb index ac1d1c33..bbdab153 100644 --- a/app/views/settings/accounts/new.html.erb +++ b/app/views/settings/accounts/new.html.erb @@ -4,7 +4,7 @@
  • Account
  • New
    • - <%= link_to 'Back', settings_accounts_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index 0701e585..a9142040 100644 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -34,7 +34,7 @@ <%= @settings_account.rebate %> - <%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb index a76af8e2..f2ebf3ce 100644 --- a/app/views/settings/cashier_terminals/edit.html.erb +++ b/app/views/settings/cashier_terminals/edit.html.erb @@ -4,7 +4,7 @@
  • Terminals
  • Edit
    • - <%= link_to 'Back', settings_cashier_terminals_path %> + <%= link_to t('.new', :default => t("views.btn.new")), 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 2b77f169..224157ba 100644 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -3,13 +3,13 @@
  • Home
  • Cashier Terminal
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -41,8 +41,8 @@ <%= settings_cashier_terminal.show_tax %> <%= settings_cashier_terminal.show_cashier %> <%= settings_cashier_terminal.show_guest_info %> - <%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb index 7a0945e4..984dd185 100644 --- a/app/views/settings/cashier_terminals/new.html.erb +++ b/app/views/settings/cashier_terminals/new.html.erb @@ -4,7 +4,7 @@
  • Cashier Terminals
  • New
    • - <%= link_to 'Back', settings_cashier_terminals_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_cashier_terminals_path %>
    diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb index 83c9f094..1fa688f3 100644 --- a/app/views/settings/commissioners/edit.html.erb +++ b/app/views/settings/commissioners/edit.html.erb @@ -15,7 +15,7 @@
  • Commissioner
  • Edit
    • - <%= link_to 'Back', settings_accounts_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index 617c2608..ac3891a1 100644 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -3,13 +3,13 @@
  • Home
  • Commissioner
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_commissioner_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_commissioner_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -40,9 +40,9 @@ <%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.is_active %> - <%= link_to 'Show', settings_commissioner_path(commissioner),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Edit', edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-lg waves-effect' %> + <%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/commissioners/new.html.erb b/app/views/settings/commissioners/new.html.erb index 3c5ec370..ee973758 100644 --- a/app/views/settings/commissioners/new.html.erb +++ b/app/views/settings/commissioners/new.html.erb @@ -4,7 +4,7 @@
  • Commissioner
  • New
    • - <%= link_to 'Back', settings_accounts_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index 7f2005c6..bad10952 100644 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -56,9 +56,9 @@ - <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %> - <%= link_to 'Edit', edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %> - <%= link_to 'Destroy', settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_commissioners_path, class: 'btn btn-success' %> + <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %> + <%= link_to t("views.btn.delete"), settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %> diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index 30422fd1..24e10366 100644 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -11,7 +11,7 @@
    - <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_commissions_path, class: 'btn btn-success' %> <%= f.button :submit, class: 'btn btn-info' %>
    <% end %> diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb index a30fda08..5b8ce0a4 100644 --- a/app/views/settings/commissions/index.html.erb +++ b/app/views/settings/commissions/index.html.erb @@ -3,7 +3,7 @@
  • Home
  • Commissions
    • - <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %> @@ -28,9 +28,9 @@ <%= commission.commission_type rescue '-' %> <%= commission.amount rescue '-' %> <%= commission.is_active rescue '-' %> - <%= link_to 'Show', settings_commissions_path(commission) %> - <%= link_to 'Edit', edit_settings_commission_path(commission) %> - <%= link_to 'Destroy', settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %> + <%= link_to t("views.btn.show"), settings_commissions_path(commission) %> + <%= link_to t("views.btn.edit"), edit_settings_commission_path(commission) %> + <%= link_to t("views.btn.delete"), settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %> <% end %> diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index 557c7465..001f2a8c 100644 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -32,9 +32,9 @@ - <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %> - <%= link_to 'Edit', edit_settings_commission_path(@commission), class: 'btn btn-info' %> - <%= link_to 'Destroy', settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_commissions_path, class: 'btn btn-success' %> + <%= link_to t("views.btn.edit"), edit_settings_commission_path(@commission), class: 'btn btn-info' %> + <%= link_to t("views.btn.delete"), settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %> diff --git a/app/views/settings/dining_charges/index.html.erb b/app/views/settings/dining_charges/index.html.erb index 0b3424ac..73f91387 100644 --- a/app/views/settings/dining_charges/index.html.erb +++ b/app/views/settings/dining_charges/index.html.erb @@ -12,9 +12,9 @@ <% @dining_charges.each do |dining_charge| %> - <%= link_to 'Show', dining_charge %> - <%= link_to 'Edit', edit_dining_charge_path(dining_charge) %> - <%= link_to 'Destroy', dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), dining_charge %> + <%= link_to t("views.btn.edit"), edit_dining_charge_path(dining_charge) %> + <%= link_to t("views.btn.delete"), dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/dining_charges/show.html.erb b/app/views/settings/dining_charges/show.html.erb index b37298ae..369f2647 100644 --- a/app/views/settings/dining_charges/show.html.erb +++ b/app/views/settings/dining_charges/show.html.erb @@ -1,4 +1,4 @@

    <%= notice %>

    -<%= link_to 'Edit', edit_dining_charge_path(@dining_charge) %> | -<%= link_to 'Back', dining_charges_path %> +<%= link_to t("views.btn.edit"), edit_dining_charge_path(@dining_charge) %> | +<%= link_to t('.new', :default => t("views.btn.new")), dining_charges_path %> diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb index b25402ee..872e03b0 100644 --- a/app/views/settings/employees/edit.html.erb +++ b/app/views/settings/employees/edit.html.erb @@ -5,7 +5,7 @@
  • Employees
  • Edit
    • - <%= link_to 'Back', settings_employees_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_employees_path %> diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index acc01dc6..e039577f 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -4,13 +4,13 @@
  • Home
  • Employee
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -36,11 +36,11 @@ <%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_employee_path(employee),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-lg waves-effect' %> <%if employee.role != "administrator"%> - <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> <%end%> diff --git a/app/views/settings/employees/new.html.erb b/app/views/settings/employees/new.html.erb index cbba3f3f..b13f2467 100644 --- a/app/views/settings/employees/new.html.erb +++ b/app/views/settings/employees/new.html.erb @@ -5,7 +5,7 @@
  • Employees
  • New
    • - <%= link_to 'Back', settings_employees_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_employees_path %> diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 15ae60bb..140c41b7 100644 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -3,7 +3,7 @@
  • Home
  • Employee
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_employee_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_employee_path,:class => 'btn btn-primary btn-sm' %> --> @@ -13,7 +13,7 @@
  • Employees
  • Details
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %> @@ -40,7 +40,7 @@ <%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index f4c85cca..2fe73f7d 100644 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -4,7 +4,7 @@
  • Item Sets
  • New
    • - <%= link_to 'Back', settings_item_sets_path %> + <%= link_to t('.new', :default => t("views.btn.new")), 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 1294c82f..9c32d48b 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -4,13 +4,13 @@
  • Home
  • Item Set
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t("views.btn.back"), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -35,9 +35,9 @@ <%= item.alt_name %> <%= item.min_selectable_qty %> <%= item.max_selectable_qty %> - <%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> - <%= link_to 'Edit', edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + <%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to t("views.btn.delete"), settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> <% end %> diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index 089f84e9..2ddba41e 100644 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -4,7 +4,7 @@
  • Item Sets
  • New
    • - <%= link_to 'Back', settings_item_sets_path %> + <%= link_to t('.new', :default => t("views.btn.new")), 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 d3c526c8..23e290f8 100644 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -5,7 +5,7 @@
  • Item Set
  • Details
    • - <%= link_to 'Back', settings_item_sets_path %> + <%= link_to t("views.btn.back"), settings_item_sets_path %> diff --git a/app/views/settings/lookups/edit.html.erb b/app/views/settings/lookups/edit.html.erb index 6f7eb27e..04863c35 100644 --- a/app/views/settings/lookups/edit.html.erb +++ b/app/views/settings/lookups/edit.html.erb @@ -5,7 +5,7 @@
  • Lookup
  • Edit
    • - <%= link_to 'Back', settings_lookups_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %> diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index 261541ea..7dc9acad 100644 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -4,13 +4,13 @@
  • Home
  • LookUp
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_lookup_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -32,8 +32,8 @@ <%= settings_lookup.lookup_type %> <%= settings_lookup.name %> <%= settings_lookup.value %> - - <%= link_to 'Edit', edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-lg waves-effect' %> <%= link_to 'Destroy', settings_lookup_path(settings_lookup), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + + <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-lg waves-effect' %> <%= link_to t("views.btn.delete"), settings_lookup_path(settings_lookup), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/lookups/new.html.erb b/app/views/settings/lookups/new.html.erb index 832971a4..9d98a288 100644 --- a/app/views/settings/lookups/new.html.erb +++ b/app/views/settings/lookups/new.html.erb @@ -5,7 +5,7 @@
  • Lookup
  • New
    • - <%= link_to 'Back', settings_lookups_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %>
    diff --git a/app/views/settings/lookups/show.html.erb b/app/views/settings/lookups/show.html.erb index 5f421e2f..1dd151be 100644 --- a/app/views/settings/lookups/show.html.erb +++ b/app/views/settings/lookups/show.html.erb @@ -4,7 +4,7 @@
  • Lookups
  • Details
    • - <%= link_to 'Back', settings_lookups_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %> diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb index cd5cb98a..6eb1e0fa 100644 --- a/app/views/settings/membership_actions/edit.html.erb +++ b/app/views/settings/membership_actions/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_membership_action: @settings_membership_action %> -<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> | -<%= link_to 'Back', settings_membership_actions_path %> +<%= link_to t("views.btn.show"), settings_membership_action_path(@settings_membership_action) %> | +<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 4019e479..701184c6 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -30,9 +30,9 @@ <%= settings_membership_action.membership_type %> <%= settings_membership_action.gateway_url %> <%= settings_membership_action.merchant_account_id %> - <%= link_to 'Show', settings_membership_action_path(settings_membership_action) %> - <%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %> - <%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_membership_action_path(settings_membership_action) %> + <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(settings_membership_action) %> + <%= link_to t("views.btn.delete"), settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/membership_actions/new.html.erb b/app/views/settings/membership_actions/new.html.erb index 802e887a..ba91a02d 100644 --- a/app/views/settings/membership_actions/new.html.erb +++ b/app/views/settings/membership_actions/new.html.erb @@ -2,4 +2,4 @@ <%= render 'form', settings_membership_action: @settings_membership_action %> -<%= link_to 'Back', settings_membership_actions_path %> +<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb index 37be9266..1956ab9b 100644 --- a/app/views/settings/membership_actions/show.html.erb +++ b/app/views/settings/membership_actions/show.html.erb @@ -4,8 +4,8 @@
  • Membership Action
    • -
  • <%= link_to 'Edit', edit_settings_membership_action_path(@settings_membership_action) %> | - <%= link_to 'Back', settings_membership_actions_path %>
    • +
  • <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action) %> | + <%= link_to t('.new', :default => t("views.btn.new")), settings_membership_actions_path %>
    •  diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index 4ce72b69..737fc200 100644 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Membership Setting
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_membership_setting_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_membership_setting_path,:class => 'btn btn-primary btn-sm' %> @@ -39,8 +39,8 @@ <%= settings_membership_setting.rebate %> <%= settings_membership_setting.bonus %> <%= settings_membership_setting.point %> - - + + <% end %> diff --git a/app/views/settings/membership_settings/show.html.erb b/app/views/settings/membership_settings/show.html.erb index ecbb9ec1..81a14b17 100644 --- a/app/views/settings/membership_settings/show.html.erb +++ b/app/views/settings/membership_settings/show.html.erb @@ -35,8 +35,8 @@ <%= @settings_membership_setting.merchant_account rescue ''%> <%= @settings_membership_setting.created_by %> - <%= link_to 'Edit', edit_settings_membership_setting_path(@settings_membership_setting) %> | -<%= link_to 'Back', settings_membership_settings_path %> + <%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting) %> | +<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_settings_path %> diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 718eba9b..b7c70e63 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -39,14 +39,12 @@ <%= link_to settings_menu_category.menu.name, settings_menu_path(settings_menu_category.menu) %> <%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %> - <%= settings_menu_category.alt_name rescue ''%> <%= settings_menu_category.is_available rescue false%> <%= settings_menu_category.order_by rescue ''%> <%= settings_menu_category.parent.name rescue ''%> - <%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> - + <%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 6e296639..3d207b4c 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -46,7 +46,7 @@ <%= settings_menu_category.is_available rescue false%> <%= @settings_menu_category.order_by %> <%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %> @@ -71,8 +71,7 @@ Parent Item Created at - - + Actions <% settings_menu_items = @settings_menu_category.menu_items %> @@ -85,19 +84,18 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> - <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% else %> <%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% end %> <% end %> diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb index db532caf..9c7debf3 100644 --- a/app/views/settings/menu_item_attributes/_form.html.erb +++ b/app/views/settings/menu_item_attributes/_form.html.erb @@ -1,13 +1,27 @@ -<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %> - <%= f.error_notification %> +
    +
    + <%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %> + <%= f.error_notification %> -
    - <%= f.input :attribute_type %> - <%= f.input :name %> - <%= f.input :value %> -
    +
    + <%= f.input :attribute_type %> + <%= f.input :name %> + <%= f.input :value %> +
    -
    - <%= f.button :submit %> -
    -<% end %> +
    + <%= f.button :submit %> +
    + <% end %> +
    +
    +
    +
    + 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 diff --git a/app/views/settings/menu_item_attributes/edit.html.erb b/app/views/settings/menu_item_attributes/edit.html.erb index b4d6035f..6ed4355f 100644 --- a/app/views/settings/menu_item_attributes/edit.html.erb +++ b/app/views/settings/menu_item_attributes/edit.html.erb @@ -1,5 +1,16 @@ - -
    +
    +
      +
    1. Home
      2. +
    2. Menu Item Attributes
      3. +
    3. Edit
      4. + + <%= link_to 'Back', settings_menu_item_attributes_path %> + +
    +
    +
    + <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> + \ No newline at end of file diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index 6ea26787..d3eeb9b2 100644 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -1,35 +1,76 @@ - +
    -
      -
    • Home
      • -
    • Menu Item Attributes
      • - - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-sm' %> - -
    +
      +
    1. Home
      2. +
    2. Menu Item Attributes
      3. + + <%= link_to 'Back', dashboard_path %> + +
    +
    +
    +
    -
    -
    - - - - - - - - - - - <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %> - - - - - - - <% end %> - -
    Attribute typeNameValue
    <%= link_to settings_menu_item_attribute.attribute_type, settings_menu_item_attribute_path(settings_menu_item_attribute) %><%= settings_menu_item_attribute.name %><%= settings_menu_item_attribute.value %><%= link_to 'Edit', edit_settings_menu_item_attribute_path(settings_menu_item_attribute) %> - | <%= link_to 'Destroy', settings_menu_item_attribute_path(settings_menu_item_attribute), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
      +
    • <%= link_to 'Menu Categories', dashboard_path %>
      • +
    • <%= link_to 'Menu Item', dashboard_path %>
      • +
    • <%= link_to 'Item Set', dashboard_path %>
      • +
    • <%= link_to 'Simple Menu', dashboard_path %>
      • +
    • <%= link_to 'Set Menu', dashboard_path %>
      • +
    +
    +
    +
    +
    +

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

    +
    + + + + + + + + + + + + <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %> + + + + + + + <% end %> + +
    Attribute typeNameValue
    <%= link_to settings_menu_item_attribute.attribute_type, settings_menu_item_attribute_path(settings_menu_item_attribute) %><%= settings_menu_item_attribute.name %><%= settings_menu_item_attribute.value %> + <%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(settings_menu_item_attribute),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_item_attribute_path(settings_menu_item_attribute), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> +
    +
    +
    +
    +
    +
    +
    + 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 diff --git a/app/views/settings/menu_item_attributes/new.html.erb b/app/views/settings/menu_item_attributes/new.html.erb index 9ac257e5..6de1a2ff 100644 --- a/app/views/settings/menu_item_attributes/new.html.erb +++ b/app/views/settings/menu_item_attributes/new.html.erb @@ -1,11 +1,12 @@ - -
    -
    - -
    - <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> +
    +
      +
    1. Home
      2. +
    2. Menu Item Attributes
      3. +
    3. Edit
      4. + + <%= link_to 'Back', settings_menu_item_attributes_path %> + +
    +
    + <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> \ No newline at end of file diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb index 35e4e6ab..b3de42fa 100644 --- a/app/views/settings/menu_item_attributes/show.html.erb +++ b/app/views/settings/menu_item_attributes/show.html.erb @@ -26,7 +26,7 @@ <%= @settings_menu_item_attribute.name %> <%= @settings_menu_item_attribute.value rescue "-" %> <%=l @settings_menu_item_attribute.created_at, format: :short %> - <%= link_to 'Edit', edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %> + <%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %> diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb index bfe6a99f..4534014a 100644 --- a/app/views/settings/menu_item_instances/index.html.erb +++ b/app/views/settings/menu_item_instances/index.html.erb @@ -5,7 +5,7 @@
  • Menu Items
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
    @@ -31,7 +31,7 @@ <%= @category.alt_name %> <%= @category.order_by %> <%= @category.parent.name rescue "-" %> - <%= link_to 'Edit', edit_settings_menu_category_path(@category) %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category) %> @@ -74,13 +74,13 @@ <%=l settings_menu_item.created_at, :format => :short %> <% if settings_menu_item.type == "SimpleMenuItem" %> - <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> - <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> - <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> + <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> <% else %> - <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> - <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> - <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> + <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> <% end %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 2eedbd81..75ba9743 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -54,9 +54,9 @@ <%= @settings_menu_item_instances.is_default %> <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if params[:simple_menu_item_id] %> - + < <% else %> - + <% end %> diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index 8226d0c8..4a91624d 100644 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -8,36 +8,62 @@
    - -
    - - - - - - - - +
    +
    +
    -
    - <% @settings_menu_item_options.each do |settings_menu_item_option| %> +
      +
    • <%= link_to 'Menu Categories', dashboard_path %>
      • +
    • <%= link_to 'Menu Item', dashboard_path %>
      • +
    • <%= link_to 'Item Set', dashboard_path %>
      • +
    • <%= link_to 'Simple Menu', dashboard_path %>
      • +
    • <%= link_to 'Set Menu', dashboard_path %>
      • +
    + + +
    +
    +
    +

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

    +
    +
    TypeNameValue
    + + + + + + + + + + + <% @settings_menu_item_options.each do |settings_menu_item_option| %> - - - - <% end %> - -
    TypeNameValueActions
    <%= settings_menu_item_option.option_type %> <%= link_to settings_menu_item_option.name, settings_menu_item_option_path(settings_menu_item_option) %> <%= settings_menu_item_option.value %><%= link_to 'Edit', edit_settings_menu_item_option_path(settings_menu_item_option) %> - | <%= link_to 'Destroy', settings_menu_item_option_path(settings_menu_item_option), method: :delete, data: { confirm: 'Are you sure?' } %>
    + + <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(settings_menu_item_option),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_item_option_path(settings_menu_item_option), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + + + <% end %> + + +
    +
    + +
    +
    +
    + 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 +
    +
    +
    + diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 413de12d..a4821fec 100644 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -27,7 +27,7 @@ <%= @settings_menu_item_option.name %> <%= @settings_menu_item_option.value rescue "-" %> <%=l @settings_menu_item_option.created_at, format: :short %> - <%= link_to 'Edit', edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %> + <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %> diff --git a/app/views/settings/menu_item_sets/edit.html.erb b/app/views/settings/menu_item_sets/edit.html.erb index 776c336f..c8efe559 100644 --- a/app/views/settings/menu_item_sets/edit.html.erb +++ b/app/views/settings/menu_item_sets/edit.html.erb @@ -1,4 +1,3 @@ -
    1. Home
      2. @@ -9,4 +8,4 @@
    -<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> \ No newline at end of file +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index fe10e6df..da0f0a0a 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -38,9 +38,12 @@ <%= item.item_set.name %> <%= item.menu_item.name %> - <%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> - <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + + <%= link_to t("views.btn.show"), settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to t("views.btn.delete"), settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + + <% end %> diff --git a/app/views/settings/menu_item_sets/new.html.erb b/app/views/settings/menu_item_sets/new.html.erb index e6731915..641153e8 100644 --- a/app/views/settings/menu_item_sets/new.html.erb +++ b/app/views/settings/menu_item_sets/new.html.erb @@ -1,4 +1,3 @@ -
    1. Home
      2. @@ -9,4 +8,4 @@
    -<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> \ No newline at end of file +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb index 458f00c5..38ea94ae 100644 --- a/app/views/settings/menu_item_sets/show.html.erb +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -29,7 +29,6 @@ -
    diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 407bbe06..111894ef 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -22,7 +22,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -49,8 +49,10 @@ - + <% end %> @@ -69,7 +71,3 @@ - - - - diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index 8c8aa470..c59d7ea1 100644 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -33,6 +33,7 @@ + @@ -43,6 +44,7 @@ +
    <%= link_to 'Edit', edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> +
    Valid To Created By Created AtAction
    <%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %> <%= @settings_menu.created_by %> <%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu) %>
    @@ -53,7 +55,7 @@

    Menu Categories - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %>

    @@ -77,7 +79,7 @@ <%= category.menu_items.count %> <%= category.order_by %> <%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb index 50da88e0..e99e46f0 100644 --- a/app/views/settings/order_queue_stations/edit.html.erb +++ b/app/views/settings/order_queue_stations/edit.html.erb @@ -4,7 +4,7 @@
  • Order Queue Stations
  • Edit
    • - <%= link_to 'Back', settings_order_queue_stations_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>
    diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 7a1c33dc..bbe1cc73 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Order Queue Stations
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
    @@ -14,7 +14,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -49,7 +49,7 @@ - + <% end %> diff --git a/app/views/settings/order_queue_stations/new.html.erb b/app/views/settings/order_queue_stations/new.html.erb index 33f23f8c..f35b7ddf 100644 --- a/app/views/settings/order_queue_stations/new.html.erb +++ b/app/views/settings/order_queue_stations/new.html.erb @@ -4,7 +4,7 @@
  • Order Queue Stations
  • New
    • - <%= link_to 'Back', settings_order_queue_stations_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %> diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 0e12b90f..d10b08e0 100644 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -5,7 +5,7 @@
  • Order Queue Stations
  • Detail
    • - <%= link_to 'Back', settings_order_queue_stations_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %> diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb index ce26c4d5..0d52f80d 100644 --- a/app/views/settings/payment_method_settings/index.html.erb +++ b/app/views/settings/payment_method_settings/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Payment Method
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_payment_method_setting_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_payment_method_setting_path,:class => 'btn btn-primary btn-sm' %> @@ -33,8 +33,8 @@ - + <% end %> diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb index b8b7f422..6cfc9ff1 100644 --- a/app/views/settings/payment_method_settings/show.html.erb +++ b/app/views/settings/payment_method_settings/show.html.erb @@ -30,5 +30,5 @@ <%= @settings_payment_method_setting.merchant_account_id %>

    -<%= link_to 'Edit', edit_settings_payment_method_setting_path(@settings_payment_method_setting) %> | -<%= link_to 'Back', settings_payment_method_settings_path %> +<%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(@settings_payment_method_setting) %> | +<%= link_to t('.new', :default => t("views.btn.new")), settings_payment_method_settings_path %> diff --git a/app/views/settings/processing_items/edit.html.erb b/app/views/settings/processing_items/edit.html.erb index af08ffda..d1039cb8 100644 --- a/app/views/settings/processing_items/edit.html.erb +++ b/app/views/settings/processing_items/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -<%= link_to 'Show', @settings_order_queue_station %> | -<%= link_to 'Back', settings_order_queue_stations_path %> +<%= link_to t("views.btn.show"), @settings_order_queue_station %> | +<%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %> diff --git a/app/views/settings/processing_items/index.html.erb b/app/views/settings/processing_items/index.html.erb index a0687711..8ae85b2c 100644 --- a/app/views/settings/processing_items/index.html.erb +++ b/app/views/settings/processing_items/index.html.erb @@ -5,7 +5,7 @@
  • Home
  • Order Queue Stations
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-sm' %> @@ -37,7 +37,7 @@ + <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/processing_items/new.html.erb b/app/views/settings/processing_items/new.html.erb index 5a112512..19386056 100644 --- a/app/views/settings/processing_items/new.html.erb +++ b/app/views/settings/processing_items/new.html.erb @@ -4,7 +4,7 @@
  • Order Queue Stations
  • <%= @settings_order_queue_station.station_name %>
    • - <%= link_to 'Back', settings_order_queue_stations_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %> diff --git a/app/views/settings/processing_items/show.html.erb b/app/views/settings/processing_items/show.html.erb index 00004528..871a0e8d 100644 --- a/app/views/settings/processing_items/show.html.erb +++ b/app/views/settings/processing_items/show.html.erb @@ -45,6 +45,6 @@ <%= @settings_order_queue_station.created_by %>

    -<%= link_to 'Edit', edit_settings_order_queue_station_path(@settings_order_queue_station) %> | <%= link_to 'Destroy', settings_order_queue_station_path(@settings_order_queue_station), method: :delete, data: { confirm: 'Are you sure?' } %> | +<%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(@settings_order_queue_station) %> | <%= link_to t("views.btn.delete"), settings_order_queue_station_path(@settings_order_queue_station), method: :delete, data: { confirm: 'Are you sure?' } %> | -<%= link_to 'Back', settings_order_queue_stations_path %> +<%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %> diff --git a/app/views/settings/products/edit.html.erb b/app/views/settings/products/edit.html.erb index beeba74c..7f36ade8 100644 --- a/app/views/settings/products/edit.html.erb +++ b/app/views/settings/products/edit.html.erb @@ -4,7 +4,7 @@
  • Products
  • Edit
    • - <%= link_to 'Back', settings_products_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %> diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb index 21685337..3358b2a1 100644 --- a/app/views/settings/products/index.html.erb +++ b/app/views/settings/products/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Product
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %> @@ -13,7 +13,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_product_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_product_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    <%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %> <%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %> <%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => ' btn-success btn-sm waves-effect' %><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %>
    <%= settings_payment_method_setting.gateway_url %> <%= settings_payment_method_setting.auth_token %> <%= settings_payment_method_setting.merchant_account_id %><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %> - | <%= link_to 'Destroy', settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(settings_payment_method_setting) %> + | <%= link_to t("views.btn.delete"), settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %>
    <%= settings_order_queue_station.use_alternate_name %> <%= settings_order_queue_station.created_by %> <%= link_to 'Assign Processing Items', settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-success btn-lg waves-effect' %> - <%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %>
    @@ -41,9 +41,9 @@ - + <% end %> diff --git a/app/views/settings/products/new.html.erb b/app/views/settings/products/new.html.erb index 58c96ba9..60940a06 100644 --- a/app/views/settings/products/new.html.erb +++ b/app/views/settings/products/new.html.erb @@ -14,7 +14,7 @@
  • Products
  • New
    • - <%= link_to 'Back', settings_products_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %> diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb index aff47f57..0ca11036 100644 --- a/app/views/settings/products/show.html.erb +++ b/app/views/settings/products/show.html.erb @@ -4,7 +4,7 @@
  • Products
  • Details
    • - <%= link_to 'Back', settings_products_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %> diff --git a/app/views/settings/promotion_products/index.html.erb b/app/views/settings/promotion_products/index.html.erb index 3fab607c..955c2b16 100644 --- a/app/views/settings/promotion_products/index.html.erb +++ b/app/views/settings/promotion_products/index.html.erb @@ -10,7 +10,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_promotion_promotion_product_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_promotion_promotion_product_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -29,7 +29,6 @@
    - <% @promotion_products.each do |pro| %> @@ -40,8 +39,8 @@ - - + + <% end %> diff --git a/app/views/settings/promotion_products/show.html.erb b/app/views/settings/promotion_products/show.html.erb index 08654f90..d999e8e6 100644 --- a/app/views/settings/promotion_products/show.html.erb +++ b/app/views/settings/promotion_products/show.html.erb @@ -37,11 +37,10 @@ -
    <%= settings_product.description %> <%= settings_product.information %> <%= settings_product.taxable %><%= link_to 'Show', settings_product_path(settings_product),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Edit', edit_settings_product_path(settings_product),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.show"), settings_product_path(settings_product),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_product_path(settings_product),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    Actions
    <%= pro.net_price rescue "-" %> <%= pro.percentage %> <%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %><%= link_to 'Edit', edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to 'Destroy', settings_promotion_promotion_product_path(pro), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to t("views.btn.delete"), settings_promotion_promotion_product_path(pro), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    Net Price<%= @promotion_product.net_price %>
    Percentage<%= @promotion_product.percentage %>
    - <%= link_to 'Edit', edit_settings_promotion_product_path(@promotion_product),,:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_promotion_product_path(@promotion_product), method: :delete, data: { confirm: 'Are you sure?' },,:class => 'btn btn-danger btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_promotion_product_path(@promotion_product),,:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_promotion_product_path(@promotion_product), method: :delete, data: { confirm: 'Are you sure?' },,:class => 'btn btn-danger btn-lg waves-effect' %>
    diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb index 3274fae1..ade27da4 100644 --- a/app/views/settings/promotions/index.html.erb +++ b/app/views/settings/promotions/index.html.erb @@ -6,7 +6,7 @@
  • Home
  • Promotions
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_promotion_path,:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_promotion_path,:class => 'btn btn-primary btn-sm' %>
    @@ -53,8 +53,8 @@ <%= pro.created_by %> <% end %> <%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_promotion_path(pro) %> - <%= link_to 'Destroy', settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro) %> + <%= link_to t("views.btn.delete"), settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb index 4a994919..03441c53 100644 --- a/app/views/settings/promotions/show.html.erb +++ b/app/views/settings/promotions/show.html.erb @@ -19,7 +19,7 @@ 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 "-" %> - <%= link_to 'Edit', edit_settings_promotion_path(@promotion) %><%= link_to 'Destroy', settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion) %><%= link_to t("views.btn.delete"), settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/settings/rooms/edit.html.erb b/app/views/settings/rooms/edit.html.erb index 2d486f52..64b8e883 100644 --- a/app/views/settings/rooms/edit.html.erb +++ b/app/views/settings/rooms/edit.html.erb @@ -5,7 +5,7 @@
  • Rooms
  • Edit
    • - <%= link_to 'Back', settings_zone_path(@zone) %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
    diff --git a/app/views/settings/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb index 9e4e0e48..892bebbd 100644 --- a/app/views/settings/rooms/index.html.erb +++ b/app/views/settings/rooms/index.html.erb @@ -10,7 +10,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_room_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_zone_room_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -43,8 +43,8 @@ <% end %> - + <% end %> diff --git a/app/views/settings/rooms/new.html.erb b/app/views/settings/rooms/new.html.erb index 04976658..80e9b581 100644 --- a/app/views/settings/rooms/new.html.erb +++ b/app/views/settings/rooms/new.html.erb @@ -16,7 +16,7 @@
  • Rooms
  • New
    • - <%= link_to 'Back', settings_zone_path(@zone) %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %> diff --git a/app/views/settings/rooms/show.html.erb b/app/views/settings/rooms/show.html.erb index 16e0fd17..b8b8ae6b 100644 --- a/app/views/settings/rooms/show.html.erb +++ b/app/views/settings/rooms/show.html.erb @@ -42,8 +42,8 @@ <% end %> - +
    <%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,room),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    <%= @room.created_by %><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %> - <%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,@room) %> + <%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %>
    diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index 973a65e3..cc0e2038 100644 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -5,7 +5,7 @@
  • Menu Items
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
    --> @@ -37,7 +37,7 @@

    Menu Category - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= 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"' %>

    @@ -59,7 +59,7 @@ - +
    <%= @category.alt_name %> <%= @category.order_by %> <%= @category.parent.name rescue "-" %><%= link_to 'Edit', edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-lg float-right waves-effect"' %><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-lg float-right waves-effect"' %>
    @@ -102,19 +102,18 @@ <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %> <% if settings_menu_item.type == "SimpleMenuItem" %> - <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } ,:class => 'btn btn-danger 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 t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } ,:class => 'btn btn-danger btn-sm waves-effect'%> <% else %> <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger 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' %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% end %> <% end %> -
    diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index f2aff2f7..ece40155 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -50,8 +50,7 @@ <%= @settings_menu_item.menu_category_id %> <%= @settings_menu_item.min_qty %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - - <%= link_to 'Edit', edit_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-info btn-sm waves-effect' %> @@ -62,7 +61,7 @@

    Menu Item Instances - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>

    @@ -94,8 +93,8 @@ <%= settings_menu_item.promotion_price %> <%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> - <%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> + <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% end %> diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 5288d9ca..5ac18f63 100644 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -5,7 +5,7 @@
  • Menu Items
    • - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
    --> @@ -33,12 +33,11 @@
    -

    Menu Category - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm float-right waves-effect"' %> + <%= 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"' %>

    @@ -59,7 +58,7 @@ - +
    <%= @category.alt_name %> <%= @category.order_by %> <%= @category.parent.name rescue "-" %><%= link_to 'Edit', edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-sm waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-sm waves-effect' %>
    @@ -73,7 +72,6 @@ <%= 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' %> - @@ -85,7 +83,6 @@ - @@ -102,13 +99,13 @@ <% if settings_menu_item.type == "SimpleMenuItem" %> - - <% else %> + + <% else %> + <%= 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' %> + <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% end %> <% end %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 120a6b14..a5fb7962 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -56,7 +56,7 @@ - +
    Parent Item Created atActions
    <%= 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 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger 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 t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger 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 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>
    <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-danger btn-lg waves-effect' %>
    @@ -68,7 +68,7 @@

    Menu Item Instances - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %> + <%= link_to t("views.btn.new"),new_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>

    @@ -101,9 +101,8 @@ <%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> - + <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> <% end %> diff --git a/app/views/settings/tables/edit.html.erb b/app/views/settings/tables/edit.html.erb index 36ab4bd2..330dd113 100644 --- a/app/views/settings/tables/edit.html.erb +++ b/app/views/settings/tables/edit.html.erb @@ -15,7 +15,7 @@
  • Tables
  • Edit
    • - <%= link_to 'Back', settings_zone_path(@zone) %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
    diff --git a/app/views/settings/tables/index.html.erb b/app/views/settings/tables/index.html.erb index e51bacc2..0c0d01c6 100644 --- a/app/views/settings/tables/index.html.erb +++ b/app/views/settings/tables/index.html.erb @@ -11,7 +11,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -24,7 +24,7 @@ - + @@ -41,15 +41,17 @@ <% else %> <% end %> - - - - <% end %> - -
    is Active Created By Created AtAction
    <%= table.created_by %><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    -
    + <%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> + + <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table) %> + <%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %> + + + <% end %> + +
    +
    diff --git a/app/views/settings/tables/new.html.erb b/app/views/settings/tables/new.html.erb index 3be47aa7..7a929b75 100644 --- a/app/views/settings/tables/new.html.erb +++ b/app/views/settings/tables/new.html.erb @@ -5,7 +5,7 @@
  • Tables
  • New
    • - <%= link_to 'Back', settings_zone_path(@zone) %> + <%= link_to 'Back', settings_zone_path %>
    diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb index 55d56294..4db9e561 100644 --- a/app/views/settings/tables/show.html.erb +++ b/app/views/settings/tables/show.html.erb @@ -25,23 +25,29 @@ is Active Created By Created At + Action - - <%= @table.name %> - <%= @table.status %> - <%= @table.seater rescue "-" %> - <%= @table.order_by rescue "-" %> - <%= @table.is_active rescue "-" %> - <% if Employee.exists?(@table.created_by) %> - <%= Employee.find(@table.created_by).name %> - <% else %> - <%= @table.created_by %> - <% end %> - <%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - + + <%= link_to @table.name, settings_menu_path(@table) %> + <%= @table.status %> + <%= @table.seater rescue "-" %> + <%= @table.order_by rescue "-" %> + <%= @table.is_active rescue "-" %> + <% if Employee.exists?(@table.created_by) %> + <%= Employee.find(@table.created_by).name %> + <% else %> + <%= @table.created_by %> + <% end %> + <%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> + + <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table) %> + <%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %> + + +
    diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb index 735759e1..079fa0a0 100644 --- a/app/views/settings/tax_profiles/index.html.erb +++ b/app/views/settings/tax_profiles/index.html.erb @@ -11,7 +11,7 @@
    - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_tax_profile_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> + <%= link_to t("views.btn.new"),new_settings_tax_profile_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    @@ -34,8 +34,8 @@ - + <% end %> diff --git a/app/views/settings/tax_profiles/new.html.erb b/app/views/settings/tax_profiles/new.html.erb index 18ac1402..4ce9ffb0 100644 --- a/app/views/settings/tax_profiles/new.html.erb +++ b/app/views/settings/tax_profiles/new.html.erb @@ -1,7 +1,3 @@ -
      @@ -15,3 +11,4 @@

    <%= render 'form', settings_tax_profile: @settings_tax_profile %> + diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb index 9a422ad9..af5edbf3 100644 --- a/app/views/settings/tax_profiles/show.html.erb +++ b/app/views/settings/tax_profiles/show.html.erb @@ -25,5 +25,5 @@ <%= @settings_tax_profile.created_by %>

    -<%= link_to 'Edit', edit_settings_tax_profile_path(@settings_tax_profile) %> | -<%= link_to 'Back', settings_tax_profiles_path %> +<%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(@settings_tax_profile) %> | +<%= link_to t('.new', :default => t("views.btn.new")), settings_tax_profiles_path %> diff --git a/app/views/settings/zones/edit.html.erb b/app/views/settings/zones/edit.html.erb index d6b60075..4927e59b 100644 --- a/app/views/settings/zones/edit.html.erb +++ b/app/views/settings/zones/edit.html.erb @@ -5,7 +5,7 @@
  • Zones
  • Edit
    • - <%= link_to 'Back', settings_zones_path %> + <%= link_to t("views.btn.back"), settings_zones_path %> diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb index 6a825f4a..17a903a9 100644 --- a/app/views/settings/zones/index.html.erb +++ b/app/views/settings/zones/index.html.erb @@ -4,7 +4,7 @@
  • Home
  • Zones
    • - <%= link_to 'Back', dashboard_path %> + <%= link_to t("views.btn.back"), dashboard_path %> @@ -22,7 +22,7 @@ - + @@ -37,9 +37,9 @@ <% end %> <% end %> diff --git a/app/views/settings/zones/new.html.erb b/app/views/settings/zones/new.html.erb index 2393e06c..95e39045 100644 --- a/app/views/settings/zones/new.html.erb +++ b/app/views/settings/zones/new.html.erb @@ -4,7 +4,7 @@
  • Zones
  • New Zone
    • - <%= link_to 'Back', settings_zones_path %> + <%= link_to t('.new', :default => t("views.btn.new")), settings_zones_path %> diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb index 9e658c6a..c65034a1 100644 --- a/app/views/settings/zones/show.html.erb +++ b/app/views/settings/zones/show.html.erb @@ -4,7 +4,7 @@
  • Zones
  • Details
    • - <%= link_to 'Back', settings_zones_path %> + <%= link_to t("views.btn.back"), settings_zones_path %> @@ -22,7 +22,7 @@ - + @@ -36,8 +36,8 @@ <% end %> @@ -60,9 +60,10 @@ - - - + + + + @@ -79,7 +80,7 @@ <% end %> - + <% end %> <% @settings_rooms.each do |room|%> @@ -94,7 +95,7 @@ <% end %> - + <% end %> diff --git a/app/views/transactions/sales/edit.html.erb b/app/views/transactions/sales/edit.html.erb index cf11644b..eb3fe12a 100644 --- a/app/views/transactions/sales/edit.html.erb +++ b/app/views/transactions/sales/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', transactions_sale: @transactions_sale %> -<%= link_to 'Show', @transactions_sale %> | +<%= link_to t("views.btn.show"), @transactions_sale %> | <%= link_to 'Back', transactions_sales_path %> diff --git a/app/views/transactions/sales/indexback.html.erb b/app/views/transactions/sales/indexback.html.erb index c39b0ac3..52e975d1 100644 --- a/app/views/transactions/sales/indexback.html.erb +++ b/app/views/transactions/sales/indexback.html.erb @@ -46,9 +46,9 @@ - - - + + + <% end %> diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 69495054..a998f2ac 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -25,69 +25,70 @@ mm: top: "အရောင်းရဆုံး" orders: "အော်ဒါများ" credit: "အကြွေး" - home: "Home" - simple_menu_item: "Simple Menu Item" - set_menu_item: "Set Menu Item" - table: "Table" - room: "Room" - item_set: "Item Set" - category: "Category" - processed: "Processed" - competed: "Completed" + home: "မူလစာမျက်နှာ" + simple_menu_item: "ဟင်းလျာများ" + set_menu_item: "တွဲဖက်ဟင်းလျာများ" + table: "စားပွဲ" + room: "အခန်း" + item_set: "တွဲဖက်ဟင်းလျာ" + category: "အမျိုးအစား" + processed: "လုပ်ဆောင်ခဲ့ပြီး" + completed: "ဆောင်ရွက်ပြီးစီး" views: - btn: - create: "Create" - new: "New" - add: "Add" - edit: "Edit" - update: "Update" - cancel: "Cancel" - back: "Back" - show: "Show" - remove: "Remove" - delete: "Delete" - destroy: "Destroy" - submit: "Submit" - reset: "Reset" - search: "Search" - enter: "Enter" - clear: "Clear" - finish: "Finish" - filter: "Filter" - del: "DEL" - clr: "CLR" + btn: + create: "အသစ်တည်ဆောက်ရန်" + new: "အသစ်ခေါ်ရန်" + add: "ထည့်သွင်းရန်" + edit: "ပြင်ဆင်ရန်" + update: "ထပ်မံထည့်သွင်းရန်" + cancel: "ဖျက်သိမ်းရန်" + back: "နောက်သို့" + show: "ပြသရန်" + remove: "ဖယ်ရှားရန်" + delete: "ဖျက်ပစ်ရန်" + destroy: "ဖျက်စီးရန်" + submit: "တင်သွင်းရန်" + reset: "ပြန်ညှိမှု" + search: "ရှာရန်" + enter: "ဝင်ရန်" + clear: "ရှင်းလင်းရန်" + finish: "ပြီးစီးရန်" + filter: "ဇကာစစ်ရှာဖွေရန်" + del: "ဖျက်ပါ" + clr: "ရှင်းပါ" + + print_order_summary: "အော်ဒါအကျဉ်းချုပ်များ စာရွက်ထုတ်ရန်" + memeber_card: "အသင်းဝင်ကတ်ပြား" + qr_code: "QR ကုတ်ဒ်" + cash_in: "ပိုက်ဆံထည့်သွင်းရန်" + cash_out: "ပိုက်ဆံထုတ်ယူရန်" + close_cashier: "ငွေရှင်းကောင်တာပိတ်ရန်" + add_order: "အော်ဒါများထည့်သွင်းရန်" + customer: "စားသုံးသူ" + discount: "လျှော့စျေး" + charges: "ပိုက်ဆံကောက်သည်" + commissions: "ကော်မရှင်များ" + in_duties: "တာဝန်ကျသူများ" + move: "ရွေ့ပြောင်းသည်" + req_bill: "ကျသင့်ငွေတောင်းခံသည်" + first_bill: "ပထမငွေတောင်းခံလွှာ" + pay: "ပေးသည်" + void: "အတည်မဖြစ်ပါ" + foc: "မေတ္တာဖြင့်ကျွေးမွေးသည်" + nett: "အသားတင်" + cash: "ငွေသား" + credit: "အကြွေး" + other_payment: "အခြားငွေပေးဆောင်မှုများ" + percentage: "ရာခိုင်နှုန်း" + remove_item_dis: "တပွဲချင်းစျေးလျှော့ပေးခြင်းပြန်လည်ဖယ်ရှားရန်" + remove_all: "အားလုံးဖယ်ရှားရန်" + new_stock_taking: "ပစ္စည်းစာရင်းအသစ်ထည့်သွင်းရန်" + stock_check_report: "ပစ္စည်းစာရင်းစစ်ဆေးမှုအစီရင်ခံစာ" + new_inventory_product: "ကုန်လှောင်ရုံရောက်ပစ္စည်းအသစ်များ" + generate_report: "အစီရင်ခံစာများရှာဖွေရန်" + exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်" - print_order_summary: "Print Order Summary" - memeber_card: "Member Card" - qr_code: "QR Code" - cash_in: "CASH IN" - cash_out: "CASH OUT" - close_cashier: "CLOSE CASHIER" - add_order: "ADD ORDER" - customer: "CUSTOMER" - discount: "DISCOUNT" - charges: "CHARGES" - commissions: "COMMISSIONS" - in_duties: "IN DUTIES" - move: "MOVE" - req_bill: "REQ BILL" - first_bill: "FIRST BILL" - pay: "PAY" - void: "VOID" - foc: "FOC" - nett: "NETT" - cash: "CASH" - credit: "CREDIT" - other_payment: "Other Payment" - percentage: "PERCENTAGE" - remove_item_dis: "REMOVE ITEM DISCOUNT" - remove_all: "REMOVE ALL" - new_stock_taking: "NEW STOCK TAKING" - stock_check_report: "STOCK CHECK REPORT" - new_inventory_product: "NEW INVENTORY PRODUCT" - generate_report: "GENERATE REPORT" - exp_to_excel: "EXPORT TO EXCEL" pagination: first: "« ပထမ"
    <%= settings_tax_profile.inclusive %> <%= settings_tax_profile.order_by %> <%= settings_tax_profile.created_by %><%= link_to 'Edit', edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_tax_profile_path(settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_tax_profile_path(settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
    Name Is active Created byAction
    <%= settings_zone.created_by %> - <%= link_to (t :show), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to (t :edit), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to (t :destroy), settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
    Name Is active Created byAction
    <%= @settings_zone.created_by %> - <%= link_to 'Edit',edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_zone_path(@settings_zone),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to t("views.btn.edit"),edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.delete"), settings_zone_path(@settings_zone),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
    Name Type SeaterIs activeCreated byIs ActiveCreated ByCreated AtAction
    <%= settings_table.created_by %><%= settings_table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@settings_zone, settings_table),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@settings_zone, settings_table),:class => 'btn btn-info btn-lg waves-effect' %>
    <%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit' ,edit_settings_zone_room_path(@settings_zone, room),:class => 'btn btn-info btn-lg waves-effect' %><%= link_to t("views.btn.edit") ,edit_settings_zone_room_path(@settings_zone, room),:class => 'btn btn-info btn-lg waves-effect' %>
    <%= transactions_sale.rounding_adjustment %> <%= transactions_sale.amount_received %> <%= transactions_sale.amount_changed %><%= link_to 'Show', transactions_sale %><%= link_to 'Edit', edit_transactions_sale_path(transactions_sale) %><%= link_to 'Destroy', transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to t("views.btn.show"), transactions_sale %><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %>