update adminbsb setting

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 %>

app/views/crm/customers/index.html.erb

@@ -86,7 +86,7 @@
             <td><%= crm_customer.card_no rescue '-' %></td>
             <td><%= crm_customer.contact_no %></td>
             <td><%= crm_customer.email %></td>
-            <td><%= link_to 'Show', crm_customer_path(crm_customer) %></td>
+            <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
 
           </tr>
 

app/views/crm/dining_queues/index.html.erb

@@ -49,7 +49,7 @@
 <!-- tabs - End -->
 </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
-    <%= 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' %>
     <hr>
 
     <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>

app/views/crm/dining_queues/index_bk.html.erb

@@ -3,7 +3,7 @@
     <li><a href="<%=  %>">Home</a></li>
     <li>Queue</li>
     <span style="float: right">
-      <%= 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' %>
     </span>
   </ul>
 </div>

app/views/crm/dining_queues/show.html.erb

@@ -15,5 +15,5 @@
   <%= @crm_dining_queue.queue_no %>
 </p>
 
-<%= 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 %>

app/views/inventory/inventory_definitions/index.html.erb

@@ -13,9 +13,9 @@
   <tbody>
     <% @inventory_definitions.each do |inventory_definition| %>
       <tr>
-        <td><%= link_to 'Show', inventory_definition %></td>
+        <td><%= link_to t("views.btn.show"), inventory_definition %></td>
-        <td><%= link_to 'Edit', edit_inventory_definition_path(inventory_definition) %></td>
+        <td><%= link_to t("views.btn.edit"), edit_inventory_definition_path(inventory_definition) %></td>
-        <td><%= link_to 'Destroy', inventory_definition, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t("views.btn.delete"), inventory_definition, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/inventory/inventory_definitions/show.html.erb

@@ -1,4 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<%= 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 %>

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 %>

app/views/inventory/stock_check_items/index.html.erb

@@ -12,9 +12,9 @@
   <tbody>
     <% @stock_check_items.each do |stock_check_item| %>
       <tr>
-        <td><%= link_to 'Show', stock_check_item %></td>
+        <td><%= link_to t("views.btn.show"), stock_check_item %></td>
-        <td><%= link_to 'Edit', edit_stock_check_item_path(stock_check_item) %></td>
+        <td><%= link_to t("views.btn.edit"), edit_stock_check_item_path(stock_check_item) %></td>
-        <td><%= link_to 'Destroy', stock_check_item, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t("views.btn.delete"), stock_check_item, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/inventory/stock_check_items/show.html.erb

@@ -1,4 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<%= 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 %>

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 %>

app/views/inventory/stock_journals/index.html.erb

@@ -12,9 +12,9 @@
   <tbody>
     <% @stock_journals.each do |stock_journal| %>
       <tr>
-        <td><%= link_to 'Show', stock_journal %></td>
+        <td><%= link_to t("views.btn.show"), stock_journal %></td>
-        <td><%= link_to 'Edit', edit_stock_journal_path(stock_journal) %></td>
+        <td><%= link_to t("views.btn.edit"), edit_stock_journal_path(stock_journal) %></td>
-        <td><%= link_to 'Destroy', stock_journal, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t("views.btn.delete"), stock_journal, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/inventory/stock_journals/show.html.erb

@@ -1,4 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<%= 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 %>

app/views/origami/in_duties/index.html.erb

@@ -23,7 +23,7 @@
             <td><%= in_duty.commissioner.name rescue '-' %></td>
             <td><%= in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
             <td><%= in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= link_to 'Destroy', origami_destroy_in_duty_path(in_duty.dining_facility.id, in_duty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+            <td><%= 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?'} %></td>
           </tr>
       <% end %>
       </tbody>
@@ -35,7 +35,7 @@
     <%= render 'form', in_duty: @in_duty, table: @table %>
   </div>
   <span style="float: right">
-    <%= 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' %>
   </span>
 </div>
 

app/views/origami/in_duties/show.html.erb

@@ -35,8 +35,8 @@
       </tbody>
     </table>
     <%= 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 t("views.btn.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.delete"), origami_in_duty_path(@in_duty), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
   </div>
 </div>
 

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 %>

app/views/origami/product_commissions/index.html.erb

@@ -12,9 +12,9 @@
   <tbody>
     <% @product_commissions.each do |product_commission| %>
       <tr>
-        <td><%= link_to 'Show', product_commission %></td>
+        <td><%= link_to t("views.btn.show"), product_commission %></td>
-        <td><%= link_to 'Edit', edit_product_commission_path(product_commission) %></td>
+        <td><%= link_to t("views.btn.edit"), edit_product_commission_path(product_commission) %></td>
-        <td><%= link_to 'Destroy', product_commission, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t("views.btn.delete"), product_commission, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/origami/product_commissions/show.html.erb

@@ -1,4 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<%= 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 %>

app/views/print_settings/index.html.erb

@@ -4,7 +4,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Print Settings</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -45,8 +45,8 @@
           <td><%= print_setting.precision %></td>
           <td><%= print_setting.delimiter %></td>
           <td><%= print_setting.heading_space %></td>
-          <td><%= link_to 'Show', print_setting %> | <%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
+          <td><%= link_to t("views.btn.show"), print_setting %> | <%= link_to t("views.btn.edit"), edit_print_setting_path(print_setting) %></td>
-          <!-- <td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
+          <!-- <td><%= link_to t("views.btn.delete"), print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
         </tr>
       <% end %>
     </tbody>

app/views/print_settings/show.html.erb

@@ -6,7 +6,7 @@
   
   <span style="float: right">
     <li> 
-        <%= 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 %>
     </li>
 

app/views/settings/accounts/edit.html.erb

@@ -14,7 +14,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_accounts_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
     </span>
   </ol>
 </div>

app/views/settings/accounts/index.html.erb

@@ -4,12 +4,12 @@
   <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
   <li class="breadcrumb-item active">Account</li>
   <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
  </ol>
 </div>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 <br>
@@ -40,8 +40,8 @@
               <td><%= account.bonus %></td>
               <td><%= account.rebate %></td>
               <td>
-                <%= link_to 'Edit', edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> 
+                <%= link_to t("views.btn.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.delete"), settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
 
                 </td>
             </tr>

app/views/settings/accounts/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_accounts_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
     </span>
   </ol>
 </div>

app/views/settings/accounts/show.html.erb

@@ -34,7 +34,7 @@
           <!-- <td><%= @settings_account.bonus %></td> -->
           <td><%= @settings_account.rebate %></td>
 
-          <td><%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %></td>
         </tr>
       </tbody>
     </table>

app/views/settings/cashier_terminals/edit.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Terminals</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_cashier_terminals_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_cashier_terminals_path %>
     </span>
   </ol>
 </div>

app/views/settings/cashier_terminals/index.html.erb

@@ -3,13 +3,13 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Cashier Terminal</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 <div class="row">
@@ -41,8 +41,8 @@
             <td><%= settings_cashier_terminal.show_tax %></td>
             <td><%= settings_cashier_terminal.show_cashier %></td>
             <td><%= settings_cashier_terminal.show_guest_info %></td>
-            <td><%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg waves-effect' %>
+            <td><%= link_to t("views.btn.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' %></td>
+             <%= 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' %></td>
           </tr>
         <% end %>
       </tbody>

app/views/settings/cashier_terminals/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Cashier Terminals</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_cashier_terminals_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_cashier_terminals_path %>
     </span>
   </ol>
 </div>

app/views/settings/commissioners/edit.html.erb

@@ -15,7 +15,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_commissioners_path %>">Commissioner</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_accounts_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
     </span>
   </ol>
 </div>

app/views/settings/commissioners/index.html.erb

@@ -3,13 +3,13 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Commissioner</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 
@@ -40,9 +40,9 @@
             <td><%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
             <td><%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
             <td><%= commissioner.is_active %></td>
-            <td><%= link_to 'Show', settings_commissioner_path(commissioner),:class => 'btn btn-info btn-lg waves-effect' %></td>
+            <td><%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-lg waves-effect' %></td>
-            <td><%= link_to 'Edit', edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-lg waves-effect' %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-lg waves-effect' %></td>
-            <td><%= link_to 'Destroy', settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'},:class => 'btn btn-danger btn-lg waves-effect' %></td>
+            <td><%= 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' %></td>
           </tr>
       <% end %>
       </tbody>

app/views/settings/commissioners/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_commissioners_path %>">Commissioner</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_accounts_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
     </span>
   </ol>
 </div>

app/views/settings/commissioners/show.html.erb

@@ -56,9 +56,9 @@
           </tr>
           </tbody>
         </table>
-        <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
+        <%= link_to t('.new', :default => t("views.btn.new")), settings_commissioners_path, class: 'btn btn-success' %>
-        <%= link_to 'Edit', edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %>
+        <%= link_to t("views.btn.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("views.btn.delete"), settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
       </div>
     </div>
   </div>

app/views/settings/commissions/_form.html.erb

@@ -11,7 +11,7 @@
 
   </div><br>
   <div class="form-actions">
-    <%= 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' %>
   </div>
 <% end %>

app/views/settings/commissions/index.html.erb

@@ -3,7 +3,7 @@
     <li><a href="<%= settings_commissions_path %>">Home</a></li>
     <li>Commissions</li>
     <span style="float: right">
-    <%= 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' %>
   </span>
   </ul>
 </div>
@@ -28,9 +28,9 @@
           <td><%= commission.commission_type rescue '-' %></td>
           <td><%= commission.amount rescue '-' %></td>
           <td><%= commission.is_active rescue '-' %></td>
-          <td><%= link_to 'Show', settings_commissions_path(commission) %></td>
+          <td><%= link_to t("views.btn.show"), settings_commissions_path(commission) %></td>
-          <td><%= link_to 'Edit', edit_settings_commission_path(commission) %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_commission_path(commission) %></td>
-          <td><%= link_to 'Destroy', settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+          <td><%= link_to t("views.btn.delete"), settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
         </tr>
     <% end %>
     </tbody>

app/views/settings/commissions/show.html.erb

@@ -32,9 +32,9 @@
       </tr>
       </tbody>
     </table>
-    <%=	 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' %>
-    <%= link_to 'Edit', edit_settings_commission_path(@commission), class: 'btn btn-info' %>
+    <%= link_to t("views.btn.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("views.btn.delete"), settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
   </div>
 </div>
 

app/views/settings/dining_charges/index.html.erb

@@ -12,9 +12,9 @@
   <tbody>
     <% @dining_charges.each do |dining_charge| %>
       <tr>
-        <td><%= link_to 'Show', dining_charge %></td>
+        <td><%= link_to t("views.btn.show"), dining_charge %></td>
-        <td><%= link_to 'Edit', edit_dining_charge_path(dining_charge) %></td>
+        <td><%= link_to t("views.btn.edit"), edit_dining_charge_path(dining_charge) %></td>
-        <td><%= link_to 'Destroy', dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t("views.btn.delete"), dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/settings/dining_charges/show.html.erb

@@ -1,4 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<%= link_to 'Edit', edit_dining_charge_path(@dining_charge) %> |
+<%= link_to t("views.btn.edit"), edit_dining_charge_path(@dining_charge) %> |
-<%= link_to 'Back', dining_charges_path %>
+<%= link_to t('.new', :default => t("views.btn.new")), dining_charges_path %>

app/views/settings/employees/edit.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_employees_path %>">Employees</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_employees_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_employees_path %>
     </span>
   </ol>
 </div>

app/views/settings/employees/index.html.erb

@@ -4,13 +4,13 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Employee</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 
@@ -36,11 +36,11 @@
           <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
-            <%= 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%>
           </td>
         </tr>

app/views/settings/employees/new.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_employees_path %>">Employees</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_employees_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_employees_path %>
     </span>
   </ol>
 </div>

app/views/settings/employees/show.html.erb

@@ -3,7 +3,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Employee</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div> -->
@@ -13,7 +13,7 @@
     <li class="breadcrumb-item">Employees</li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
@@ -40,7 +40,7 @@
           <td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
-              <%= 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' %>
           </td>
         </tr>
       </tbody>

app/views/settings/item_sets/edit.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_item_sets_path %>">Item Sets</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_item_sets_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_item_sets_path %>
     </span>
   </ol>
 </div>

app/views/settings/item_sets/index.html.erb

@@ -4,13 +4,13 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Item Set</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t("views.btn.back"), dashboard_path %>
     </span>
   </ol>
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 
@@ -35,9 +35,9 @@
               <td><%= item.alt_name %></td>
               <td><%= item.min_selectable_qty %></td>
               <td><%= item.max_selectable_qty %></td>
-              <td><%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %>
+              <td><%= link_to t("views.btn.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 t("views.btn.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'%></td>
+              <%= link_to t("views.btn.delete"), settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%></td>
             </tr>
           <% end %>
         </tbody>

app/views/settings/item_sets/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_item_sets_path %>">Item Sets</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_item_sets_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_item_sets_path %>
     </span>
   </ol>
 </div>

app/views/settings/item_sets/show.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_item_sets_path %>">Item Set</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_item_sets_path %>
+      <%= link_to t("views.btn.back"), settings_item_sets_path %>     
     </span>
   </ol>
 </div>

app/views/settings/lookups/edit.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_lookups_path %>">Lookup</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_lookups_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %>
     </span>
   </ol>
 </div>

app/views/settings/lookups/index.html.erb

@@ -4,13 +4,13 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">LookUp</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 <div class="row">
@@ -32,8 +32,8 @@
           <td><%= settings_lookup.lookup_type %></td>
           <td><%= settings_lookup.name %></td>
           <td><%= settings_lookup.value %></td>
-          <!-- <td><%= link_to 'Show', settings_lookup_path(settings_lookup),:class => 'btn btn-info btn-lg waves-effect' %></td> -->
+          <!-- <td><%= link_to t("views.btn.show"), settings_lookup_path(settings_lookup),:class => 'btn btn-info btn-lg waves-effect' %></td> -->
-          <td><%= 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' %></td>
+          <td><%= 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' %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/lookups/new.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_lookups_path %>">Lookup</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_lookups_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %>
     </span>
   </ol>
 </div>

app/views/settings/lookups/show.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_lookups_path %>">Lookups</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_lookups_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_lookups_path %>
     </span>
   </ol>
 </div>

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 t("views.btn.show"), settings_membership_action_path(@settings_membership_action) %> |
-<%= link_to 'Back', settings_membership_actions_path %>
+<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_actions_path %>

app/views/settings/membership_actions/index.html.erb

@@ -30,9 +30,9 @@
           <td><%= settings_membership_action.membership_type %></td>
           <td><%= settings_membership_action.gateway_url %></td>
           <td><%= settings_membership_action.merchant_account_id %></td>
-          <td><%= link_to 'Show', settings_membership_action_path(settings_membership_action) %></td>
+          <td><%= link_to t("views.btn.show"), settings_membership_action_path(settings_membership_action) %></td>
-          <td><%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_membership_action_path(settings_membership_action) %></td>
-          <td><%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          <td><%= link_to t("views.btn.delete"), settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

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 %>

app/views/settings/membership_actions/show.html.erb

@@ -4,8 +4,8 @@
   <li><a href="<%= settings_membership_actions_path %>">Membership Action</a></li>
   
   <span style="float: right">
-    <li> <%= link_to 'Edit', edit_settings_membership_action_path(@settings_membership_action) %> |
+    <li> <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action) %> |
-             <%= link_to 'Back', settings_membership_actions_path %></li>
+             <%= link_to t('.new', :default => t("views.btn.new")), settings_membership_actions_path %></li>
 
   </span>
  </ul>

app/views/settings/membership_settings/index.html.erb

@@ -4,7 +4,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Membership Setting</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -39,8 +39,8 @@
           <td><%= settings_membership_setting.rebate %></td>
           <td><%= settings_membership_setting.bonus %></td>
           <td><%= settings_membership_setting.point %></td>
-         <!--  <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td> -->
+         <!--  <td><%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(settings_membership_setting) %></td> -->
-          <!-- <td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
+          <!-- <td><%= link_to t("views.btn.delete"), settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
         </tr>
       <% end %>
     </tbody>

app/views/settings/membership_settings/show.html.erb

@@ -35,8 +35,8 @@
           <td><%= @settings_membership_setting.merchant_account rescue ''%></td>
           <td><%= @settings_membership_setting.created_by %></td>
           <td>
-              <%= link_to 'Edit', edit_settings_membership_setting_path(@settings_membership_setting) %> |
+              <%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting) %> |
-<%= link_to 'Back', settings_membership_settings_path %>
+<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_settings_path %>
           </td>
         </tr>
       </tbody>

app/views/settings/menu_categories/index.html.erb

@@ -39,14 +39,12 @@
       <tr>
         <td><%= link_to settings_menu_category.menu.name, settings_menu_path(settings_menu_category.menu) %></td>
         <td><%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %></td>
-
         <td><%= settings_menu_category.alt_name rescue ''%></td>
         <td><%= settings_menu_category.is_available rescue false%></td>
         <td><%= settings_menu_category.order_by rescue ''%></td>
         <td><%= settings_menu_category.parent.name rescue ''%></td>
-        <td><%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-lg waves-effect' %> 
+        <td><%= link_to t("views.btn.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' %></td></td>
+         <%= 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' %></td></td>
-
        </tr>
        <% end %>
      </tbody>

app/views/settings/menu_categories/show.html.erb

@@ -46,7 +46,7 @@
               <td><%= settings_menu_category.is_available rescue false%></td>
               <td><%= @settings_menu_category.order_by %></td>
               <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
-              <td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %></td>
+              <td><%= 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' %></td>
             </tr>
           </tbody>
         </table>
@@ -71,8 +71,7 @@
                 <th>Parent Item</th>
                 <!-- <th>Created by</th> -->
                 <th>Created at</th>
-
+                <th>Actions</th>
-                <th></th>
               </tr>
             </thead>
             <% settings_menu_items = @settings_menu_category.menu_items %>
@@ -85,19 +84,18 @@
                 <td><%= settings_menu_item.type %></td>
                 <td><%= settings_menu_item.parent.name rescue "-" %></td>
                 <!-- <td><%= settings_menu_item.created_by %></td> -->
-
                 <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
                 <% if settings_menu_item.type == "SimpleMenuItem" %>
                 <td>
                     <%= 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 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 '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.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' %>
                   </td>
                 <% else %>
                 <td><%= 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 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 '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' %></td>
+                <%= 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' %></td>
                 <% end %>
               </tr>
               <% end %>

app/views/settings/menu_item_attributes/_form.html.erb

@@ -1,13 +1,27 @@
-<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %>
+<div class="row">
-  <%= f.error_notification %>
+	<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+		<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %>
+		<%= f.error_notification %>
 
-  <div class="form-inputs">
+		<div class="form-inputs">
-    <%= f.input :attribute_type %>
+			<%= f.input :attribute_type %>
-    <%= f.input :name %>
+			<%= f.input :name %>
-    <%= f.input :value %>
+			<%= f.input :value %>
-  </div>
+		</div>
 
-  <div class="form-actions">
+		<div class="form-actions">
-    <%= f.button :submit %>
+			<%= f.button :submit %>
-  </div>
+		</div>
-<% end %>
+		<% end %>
+	</div>
+	<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+		<div class="card">
+			<div class="body">
+				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
+			</div>
+		</div>  
+	</div>
+</div>

app/views/settings/menu_item_attributes/edit.html.erb

@@ -1,5 +1,16 @@
-
+<div class="page-header">
-<div class="span12">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attributes</a></li>
+    <li class="breadcrumb-item active">Edit</li>
+    <span class="float-right">
+      <%= link_to 'Back', settings_menu_item_attributes_path %>
+    </span>
+  </ol>
+</div>
+<br>
+ <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %>
+<!-- <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
@@ -9,3 +20,4 @@
 		</div>
     <%= render 'form', employee: @employee %>
 </div>
+ -->

app/views/settings/menu_item_attributes/index.html.erb

@@ -1,35 +1,76 @@
-
+<!-- <div class="page-header">
+   <ul class="breadcrumb">
+    <li><a href="<%=  %>">Home</a></li>
+    <li>Menu Item Attributes</li>
+    <span style="float: right">
+      <%= link_to t("views.btn.new"),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-sm' %>
+    </span>
+  </ul>
+</div> -->
 <div class="page-header">
- <ul class="breadcrumb">
+  <ol class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-  <li>Menu Item Attributes</li>
+    <li class="breadcrumb-item active">Menu Item Attributes</li>
-  <span style="float: right">
+    <span class="float-right">
-    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-sm' %>
+      <%= link_to 'Back', dashboard_path %>
-  </span>
+    </span>
- </ul>
+  </ol>
 </div>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+   <div class="card">
 
-<br>
+    <ul class="list-group">
-<div class="card">
+      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-  <table class="table table-striped">
+      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-    <thead>
+      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <tr>
+      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-        <th>Attribute type</th>
+      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
-        <th>Name</th>
+    </ul>
-        <th>Value</th>
+  </div>
-      </tr>
-    </thead>
-
-    <tbody>
-      <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %>
-        <tr>
-          <td><%= link_to settings_menu_item_attribute.attribute_type, settings_menu_item_attribute_path(settings_menu_item_attribute) %></td>
-          <td><%= settings_menu_item_attribute.name %></td>
-          <td><%= settings_menu_item_attribute.value %></td>
-          <td><%= 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?' } %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
 </div>
+<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
+    <div class="card">
+      <div class="card-block">
+        <h4 class="card-title">Menu Category
+    <%= link_to t("views.btn.new"),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </h4>
+    <hr>
+     
+      <table class="table table-striped">
+        <thead>
+          <tr>
+            <th>Attribute type</th>
+            <th>Name</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %>
+          <tr>
+            <td><%= link_to settings_menu_item_attribute.attribute_type, settings_menu_item_attribute_path(settings_menu_item_attribute) %></td>
+            <td><%= settings_menu_item_attribute.name %></td>
+            <td><%= settings_menu_item_attribute.value %></td>
+            <td>
+               <%= 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' %>
+              </td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+       </div>
+    </div>
+    <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+      <div class="card">
+        <div class="body">
+          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
+        </div>
+      </div>  
+  </div>
+</div>

app/views/settings/menu_item_attributes/new.html.erb

@@ -1,11 +1,12 @@
-
+<div class="page-header">
-<div class="span12">
+  <ol class="breadcrumb">
-		<div class="page-header">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-		 <ul class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attributes</a></li>
-		   	<li><a href="<%= root_path %>">Home</a></li>
+    <li class="breadcrumb-item active">Edit</li>
-  			<li><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attribute</a></li>
+    <span class="float-right">
-		  	<li>New</li>
+      <%= link_to 'Back', settings_menu_item_attributes_path %>
-		 </ul>
+    </span>
-		</div>
+  </ol>
-    <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %>
 </div>
+<br>
+ <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %>

app/views/settings/menu_item_attributes/show.html.erb

@@ -26,7 +26,7 @@
           <td><%= @settings_menu_item_attribute.name %></td>
           <td><%= @settings_menu_item_attribute.value  rescue "-" %></td>
           <td><%=l @settings_menu_item_attribute.created_at, format: :short %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %></td>
         </tr>
       </tbody>
     </table>

app/views/settings/menu_item_instances/index.html.erb

@@ -5,7 +5,7 @@
 
   <li>Menu Items</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -31,7 +31,7 @@
             <td><%= @category.alt_name %></td>
             <td><%= @category.order_by %></td>
             <td><%= @category.parent.name rescue "-" %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_path(@category) %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category) %></td>
           </tr>
       </tbody>
     </table>
@@ -74,13 +74,13 @@
             <td><%=l settings_menu_item.created_at, :format => :short %></td>
 
             <% if settings_menu_item.type == "SimpleMenuItem" %>
-            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
             <% else %>
-            <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
             <% end %>
           </tr>
         <% end %>

app/views/settings/menu_item_instances/show.html.erb

@@ -54,9 +54,9 @@
           <td><%= @settings_menu_item_instances.is_default %></td>
           <td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <% if params[:simple_menu_item_id] %>
-          <!-- <td><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> -->
+          <<!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> -->
           <% else %>
-         <!--  <td><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> -->
+          <!-- <td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> -->
           <% end %>
 
         </tr>

app/views/settings/menu_item_options/index.html.erb

@@ -8,36 +8,62 @@
   </ol>
 </div>
 
-<!-- <div class="page-header">
+<div class="row">
- <ul class="breadcrumb">
+ <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
-  <li><a href="<%=  %>">Home</a></li>
+   <div class="card">
-  <li>Menu Item Option</li>
-  <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-sm' %>
-  </span>
- </ul>
-</div> -->
-<div class="card">
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Value</th>
-      </tr>
-    </thead>
 
-    <tbody>
+    <ul class="list-group">
-      <% @settings_menu_item_options.each do |settings_menu_item_option| %>
+      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+    </ul>
+  </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
+  <div class="card">
+   <div class="card-block">
+   <h4 class="card-title">Menu Category
+    <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </h4>
+    <hr>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Type</th>
+          <th>Name</th>
+          <th>Value</th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @settings_menu_item_options.each do |settings_menu_item_option| %>
         <tr>
           <td><%= settings_menu_item_option.option_type %></td>
           <td><%= link_to settings_menu_item_option.name, settings_menu_item_option_path(settings_menu_item_option) %></td>
           <td><%= settings_menu_item_option.value %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_item_option_path(settings_menu_item_option) %>
+          <td>
-          | <%= link_to 'Destroy', settings_menu_item_option_path(settings_menu_item_option), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <%= 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' %>              
-        </tr>
+            </td>
-      <% end %>
+          </tr>
-    </tbody>
+          <% end %>
-  </table>
+        </tbody>
+      </table>
+    </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        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
+      </div>
+    </div>  
+  </div>
 </div>
+

app/views/settings/menu_item_options/show.html.erb

@@ -27,7 +27,7 @@
           <td><%= @settings_menu_item_option.name %></td>
           <td><%= @settings_menu_item_option.value  rescue "-" %></td>
           <td><%=l @settings_menu_item_option.created_at, format: :short %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %></td>
         </tr>
       </tbody>
     </table>

app/views/settings/menu_item_sets/edit.html.erb

@@ -1,4 +1,3 @@
-
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -9,4 +8,4 @@
     </span>
   </ol>
 </div>
-<%= render 'form', settings_menu_item_set: @settings_menu_item_set %>
+<%= render 'form', settings_menu_item_set: @settings_menu_item_set %>

app/views/settings/menu_item_sets/index.html.erb

@@ -38,9 +38,12 @@
       <tr>
         <td><%= item.item_set.name %></td>
         <td><%= item.menu_item.name %></td>
-        <td><%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %>
+        <td>
-          <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %>
+          <%= link_to t("views.btn.show"), settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %>
-          <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%></td>
+          <%= 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'%>
+            
+          </td>
         </tr>
         <% end %>
       </tbody>

app/views/settings/menu_item_sets/new.html.erb

@@ -1,4 +1,3 @@
-
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -9,4 +8,4 @@
     </span>
   </ol>
 </div>
-<%= render 'form', settings_menu_item_set: @settings_menu_item_set %>
+<%= render 'form', settings_menu_item_set: @settings_menu_item_set %>

app/views/settings/menu_item_sets/show.html.erb

@@ -29,7 +29,6 @@
       </tbody>
     </table>
    </div>
-
   </div>
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">

app/views/settings/menus/index.html.erb

@@ -22,7 +22,7 @@
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
   <div class="m-b-10 clearfix">
-    <%= 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"' %>
   </div>
   <div class="card">
     <table class="table table-striped">
@@ -49,8 +49,10 @@
             <!-- <td><%= settings_menu.created_by %></td> -->
             <!-- <td><%=l settings_menu.created_at, format: :short %></td> -->
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
-            <td><%= link_to 'Edit', edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
+            <td>
-              <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+              <%= 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' %>
+              </td>
             </tr>
             <% end %>
           </tbody>
@@ -69,7 +71,3 @@
       </div>  
     </div>
   </div>
-
-
-
-

app/views/settings/menus/show.html.erb

@@ -33,6 +33,7 @@
             <th>Valid To</th>
             <th>Created By</th>
             <th>Created At</th> 
+            <th>Action</th>
           </tr>
         </thead>
         <tbody>
@@ -43,6 +44,7 @@
             <td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
             <td><%= @settings_menu.created_by %></td>
             <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu) %></td>
           </tr>
         </tbody>
       </table>
@@ -53,7 +55,7 @@
     <div class="card-block">
       <h4 class="card-title">Menu Categories
         <span style="float: right">
-          <%= 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' %>
         </span>
 
       </h4>
@@ -77,7 +79,7 @@
           <td><%= category.menu_items.count %></td>
           <td><%= category.order_by %></td>
           <td><%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
         </tr>
         <% end %>
       </tbody>

app/views/settings/order_queue_stations/edit.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_order_queue_stations_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>
     </span>
   </ol>
 </div>

app/views/settings/order_queue_stations/index.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Order Queue Stations</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
@@ -14,7 +14,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
   <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
     <div class="card">
       <table class="table">
@@ -49,7 +49,7 @@
               <td><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
               <td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td>
               <td><%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => ' btn-success btn-sm waves-effect' %></td>
-              <td><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %></td>
+              <td><%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %></td>
             </tr>
           <% end %>
         </tbody>

app/views/settings/order_queue_stations/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_order_queue_stations_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>
     </span>
   </ol>
 </div>

app/views/settings/order_queue_stations/show.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
     <li class="breadcrumb-item active">Detail</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_order_queue_stations_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>
     </span>
   </ol>
 </div>

app/views/settings/payment_method_settings/index.html.erb

@@ -4,7 +4,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Payment Method</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -33,8 +33,8 @@
           <td><%= settings_payment_method_setting.gateway_url %></td>
           <td><%= settings_payment_method_setting.auth_token %></td>
           <td><%= settings_payment_method_setting.merchant_account_id %></td>
-          <td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %>
+          <td><%= link_to t("views.btn.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?' } %></td>
+          | <%= link_to t("views.btn.delete"), settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/payment_method_settings/show.html.erb

@@ -30,5 +30,5 @@
   <%= @settings_payment_method_setting.merchant_account_id %>
 </p>
 
-<%= link_to 'Edit', edit_settings_payment_method_setting_path(@settings_payment_method_setting) %> |
+<%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(@settings_payment_method_setting) %> |
-<%= link_to 'Back', settings_payment_method_settings_path %>
+<%= link_to t('.new', :default => t("views.btn.new")), settings_payment_method_settings_path %>

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 t("views.btn.show"), @settings_order_queue_station %> |
-<%= link_to 'Back', settings_order_queue_stations_path %>
+<%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>

app/views/settings/processing_items/index.html.erb

@@ -5,7 +5,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Order Queue Stations</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -37,7 +37,7 @@
           <td><%= settings_order_queue_station.use_alternate_name %></td>
           <td><%= settings_order_queue_station.created_by %></td>
           <td><%= 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' %></td>
+          <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-lg waves-effect' %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/processing_items/new.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_order_queue_stations_path %>">Order Queue Stations</a></li>
     <li class="breadcrumb-item active"><%= @settings_order_queue_station.station_name %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_order_queue_stations_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_order_queue_stations_path %>
     </span>
   </ol>
 </div>

app/views/settings/processing_items/show.html.erb

@@ -45,6 +45,6 @@
   <%= @settings_order_queue_station.created_by %>
 </p>
 
-<%= 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 %>

app/views/settings/products/edit.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_products_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %>
     </span>
   </ol>
 </div>

app/views/settings/products/index.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Product</li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
     </span>
   </ol>
 </div>
@@ -13,7 +13,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
   <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
     <div class="card">
   <table class="table table-striped">
@@ -41,9 +41,9 @@
           <td><%= settings_product.description %></td>
           <td><%= settings_product.information %></td>
           <td><%= settings_product.taxable %></td>
-          <td><%= link_to 'Show', settings_product_path(settings_product),:class => 'btn btn-info btn-lg waves-effect' %>
+          <td><%= link_to t("views.btn.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 t("views.btn.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' %></td>
+          <%= 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' %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/products/new.html.erb

@@ -14,7 +14,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_products_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %>
     </span>
   </ol>
 </div>

app/views/settings/products/show.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_products_path %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_products_path %>
     </span>
   </ol>
 </div>

app/views/settings/promotion_products/index.html.erb

@@ -10,7 +10,7 @@
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= 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"' %>
 </div>
 
 <div class="row">
@@ -29,7 +29,6 @@
             <th>Actions</th>
           </tr>
         </thead>
-
         <tbody>
           <% @promotion_products.each do |pro| %>
             <tr>
@@ -40,8 +39,8 @@
               <td><%= pro.net_price rescue "-" %></td>
               <td><%= pro.percentage %></td>
               <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %></td>
-              <td><%= link_to 'Edit', edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %></td>
+              <td><%= link_to t("views.btn.edit"), edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %></td>
-              <td><%= link_to 'Destroy', settings_promotion_promotion_product_path(pro), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
+              <td><%= 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' %></td>
             </tr>
           <% end %>
         </tbody>

app/views/settings/promotion_products/show.html.erb

@@ -37,11 +37,10 @@
           <tr><td style="width:20%">Net Price</td><td><%= @promotion_product.net_price %></td></tr>
           <tr><td style="width:20%">Percentage</td><td><%= @promotion_product.percentage %></td></tr>
           <tr><td style="width:20%">
-          <%= link_to 'Edit', edit_settings_promotion_product_path(@promotion_product),,:class => 'btn btn-info 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 '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.delete"), settings_promotion_product_path(@promotion_product), method: :delete, data: { confirm: 'Are you sure?' },,:class => 'btn btn-danger btn-lg waves-effect' %>
             
           </td></tr>
-
       </tbody>
     </table>
   </div>

app/views/settings/promotions/index.html.erb

@@ -6,7 +6,7 @@
   <li><a href="<%= root_path %>">Home</a></li>
   <li>Promotions</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div>
@@ -53,8 +53,8 @@
           <td><%= pro.created_by %></td>
           <% end %>
           <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-          <td><%= link_to 'Edit', edit_settings_promotion_path(pro) %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro) %></td>
-          <td><%= link_to 'Destroy', settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          <td><%= link_to t("views.btn.delete"), settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/promotions/show.html.erb

@@ -19,7 +19,7 @@
           <tr><td style="width:20%">Promotion End Date</td><td><%= @promotion.promo_end_date %></td></tr>
           <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-"  %></td></tr>
           <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-"  %></td></tr>
-          <tr><td style="width:20%"><%= link_to 'Edit', edit_settings_promotion_path(@promotion) %></td><td><%= link_to 'Destroy', settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
+          <tr><td style="width:20%"><%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion) %></td><td><%= link_to t("views.btn.delete"), settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
 
 
       </tbody>

app/views/settings/rooms/edit.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Rooms</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_zone_path(@zone) %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
     </span>
   </ol>
 </div>

app/views/settings/rooms/index.html.erb

@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <div class="m-b-10 clearfix">
-      <%= 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"' %>
     </div>
     <div class="card">
       <table class="table table-striped">
@@ -43,8 +43,8 @@
             <td><%= room.created_by %></td>
             <% end %>
             <td><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room),:class => 'btn btn-info btn-lg waves-effect' %>
+            <td><%= link_to t("views.btn.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' %></td>
+            <%= 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' %></td>
           </tr>
           <% end %>
         </tbody>

app/views/settings/rooms/new.html.erb

@@ -16,7 +16,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Rooms</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_zone_path(@zone) %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
     </span>
   </ol>
 </div>

app/views/settings/rooms/show.html.erb

@@ -42,8 +42,8 @@
             <td><%= @room.created_by %></td>
             <% end %>
             <td><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %>
+            <td><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,@room) %>
-              <%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+              <%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %></td>
             </tr>
           </tbody>
         </table>

app/views/settings/set_menu_items/index.html.erb

@@ -5,7 +5,7 @@
 
   <li>Menu Items</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div> -->
@@ -37,7 +37,7 @@
     <div class="card-block">
       <h4 class="card-title">Menu Category
       <!-- <div class="m-b-10 clearfix"> -->
-    <%= 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"' %>
   <!-- </div> --></h4>
 
       <table class="table">
@@ -59,7 +59,7 @@
             <td><%= @category.alt_name %></td>
             <td><%= @category.order_by %></td>
             <td><%= @category.parent.name rescue "-" %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-lg float-right waves-effect"' %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-lg float-right waves-effect"' %></td>
           </tr>
         </tbody>
       </table>
@@ -102,19 +102,18 @@
             <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
             <% if settings_menu_item.type == "SimpleMenuItem" %>
-            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+              <td><%= 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 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 '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'%></td>
+                <%= 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'%></td>
               <% else %>
               <td><%= 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 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 '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' %></td>
+                <%= 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' %></td>
                 <% end %>
               </tr>
               <% end %>
             </tbody>
           </table>
-
         </div>
 
       </div>

app/views/settings/set_menu_items/show.html.erb

@@ -50,8 +50,7 @@
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>
           <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
-
+          <td><%= 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' %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %></td>
         </tr>
       </tbody>
     </table>
@@ -62,7 +61,7 @@
   <div class="card-block">
     <h4 class="card-title">Menu Item Instances
       <span style="float: right">
-        <%= 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' %>
       </span>
 
     </h4>
@@ -94,8 +93,8 @@
             <td><%= settings_menu_item.promotion_price %></td>
            <!--  <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
             <td><%= 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 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 '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' %></td>
+            <%= 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' %></td>
           </tr>
         <% end %>
       </tbody>

app/views/settings/simple_menu_items/index.html.erb

@@ -5,7 +5,7 @@
 
   <li>Menu Items</li>
   <span style="float: right">
-    <%= 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' %>
   </span>
  </ul>
 </div> -->
@@ -33,12 +33,11 @@
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
-
   <div class="card">
     <div class="card-block">
       <h4 class="card-title">Menu Category
         <!-- <div class="m-b-10 clearfix"> -->
-        <%= 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"' %>
         <!-- </div> --></h4>
         <table class="table">
           <thead>
@@ -59,7 +58,7 @@
               <td><%= @category.alt_name %></td>
               <td><%= @category.order_by %></td>
               <td><%= @category.parent.name rescue "-" %></td>
-              <td><%= link_to 'Edit', edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-sm waves-effect' %></td>
+              <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-sm waves-effect' %></td>
             </tr>
           </tbody>
         </table>
@@ -73,7 +72,6 @@
           <span style="float: right">
             <%= 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' %>
-
           </span></h4>
           <table class="table">
             <thead>
@@ -85,7 +83,6 @@
                 <th>Parent Item</th>
                 <!-- <th>Created by</th> -->
                 <th>Created at</th>
-
                 <th>Actions</th>
               </tr>
             </thead>
@@ -102,13 +99,13 @@
                 <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
                 <% if settings_menu_item.type == "SimpleMenuItem" %>
-                <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+                  <td><%= 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 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 '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' %></td>
+                  <%= 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' %></td>
-                  <% else %>
+                <% else %>
                   <td><%= 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 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 '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' %></td>
+                  <%= 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' %></td>
                     <% end %>
                   </tr>
                   <% end %>

app/views/settings/simple_menu_items/show.html.erb

@@ -56,7 +56,7 @@
 
           <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
-          <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-danger btn-lg waves-effect' %></td>
+          <td><%= 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' %></td>
         </tr>
       </tbody>
     </table>
@@ -68,7 +68,7 @@
     <h4 class="card-title">Menu Item Instances
       <span style="float: right">
 
-        <%= 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' %>
       </span>
 
     </h4>
@@ -101,9 +101,8 @@
           <!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
 
           <td><%= 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 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 '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' %></td>
+          <%= 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' %></td>
-
         </tr>
         <% end %>
       </tbody>

app/views/settings/tables/edit.html.erb

@@ -15,7 +15,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Tables</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_zone_path(@zone) %>
+      <%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
     </span>
   </ol>
 </div>

app/views/settings/tables/index.html.erb

@@ -11,7 +11,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <div class="m-b-10 clearfix">
-      <%= 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"' %>
     </div>
     <div class="card">
       <table class="table table-striped">
@@ -24,7 +24,7 @@
             <th>is Active</th>
             <th>Created By</th>
             <th>Created At</th>
-
+            <th>Action</th>
           </tr>
         </thead>
 
@@ -41,15 +41,17 @@
             <% else %>
                <td><%= table.created_by %></td>
             <% end %>
-            <td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          <td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to 'Edit', edit_settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-lg waves-effect' %>
+          <td>
-            <%= link_to 'Destroy', settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
+          <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table) %>
-          </tr>
+          <%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %>
-          <% end %>
+          </td>
-        </tbody>
+        </tr>
-      </table>
+        <% end %>
-    </div>
+      </tbody>
+    </table>
   </div>
+
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">

app/views/settings/tables/new.html.erb

@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Tables</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_zone_path(@zone) %>
+		<%= link_to 'Back', settings_zone_path %>
     </span>
   </ol>
 </div>