merge with origin and add localize

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/origami/in_duties/index.html.erb

@@ -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/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>

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

@@ -9,7 +9,7 @@
  </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>

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

@@ -9,7 +9,7 @@
 </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">

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

@@ -9,7 +9,7 @@
 </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>
 
 

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>

app/views/settings/employees/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_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>
 
 

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

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 t('.new', :default => t("views.btn.new")), 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>
 
 

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 t('.new', :default => t("views.btn.new")), settings_item_sets_path %>
+      <%= link_to t("views.btn.back"), settings_item_sets_path %>     
     </span>
   </ol>
 </div>

app/views/settings/lookups/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_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">

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>

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

@@ -43,8 +43,8 @@
         <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>
@@ -89,13 +89,13 @@
                 <% 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/index.html.erb

@@ -4,7 +4,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <li>Menu Item Attributes</li>
   <span style="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 t("views.btn.new"),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-sm' %>
   </span>
  </ul>
 </div>

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>

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

@@ -5,7 +5,7 @@
   <li><a href="<%=  %>">Home</a></li>
   <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' %>
+    <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-sm' %>
   </span>
  </ul>
 </div>

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,8 @@
             <!-- <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-lg waves-effect' %>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-lg waves-effect' %>
-              <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
+              <%= link_to t("views.btn.delete"), settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
             </tr>
             <% end %>
           </tbody>

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

@@ -55,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>
@@ -79,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/index.html.erb

@@ -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">

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>

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>

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

@@ -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">

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">
@@ -39,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,8 +37,8 @@
           <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>

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>

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/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>
@@ -103,12 +103,12 @@
 
             <% 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' %>
-                <%= 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 %>

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

@@ -50,7 +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 '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 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>
         </tr>
       </tbody>
     </table>
@@ -61,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>
@@ -93,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> -->
@@ -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_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>
@@ -58,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>
@@ -100,12 +100,12 @@
 
                 <% 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' %>
-                  <%= 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 %>

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,8 +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/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>
 
@@ -42,8 +42,10 @@
                <td><%= table.created_by %></td>
             <% end %>
           <td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-          <td><%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table) %></td>
+          <td>
-          <td><%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table) %>
+          <%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %>
+          </td>
         </tr>
         <% end %>
       </tbody>

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 t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
+		<%= link_to 'Back', settings_zone_path %>
     </span>
   </ol>
 </div>

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

@@ -25,6 +25,7 @@
               <th>is Active</th>
               <th>Created By</th>
               <th>Created At</th>
+              <th>Action</th>
             </tr>
           </thead>
 
@@ -41,8 +42,11 @@
                 <td><%= @table.created_by %></td>
                 <% end %>
                 <td><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-                <td><%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table) %></td>
+                <td>
-                <td><%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+                <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table) %>
+                <%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %>
+                  
+                </td>
               </tr>
           </tbody>
         </table>

app/views/settings/tax_profiles/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_tax_profile_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+      <%= link_to t("views.btn.new"),new_settings_tax_profile_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </div>
     <div class="card">
         <table class="table">
@@ -34,8 +34,8 @@
               <td><%= settings_tax_profile.inclusive %></td>
               <td><%= settings_tax_profile.order_by %></td>
               <td><%= settings_tax_profile.created_by %></td>
-              <td><%= link_to 'Edit', edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %>
+              <td><%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %>
-              <%= link_to 'Destroy', settings_tax_profile_path(settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
+              <%= link_to t("views.btn.delete"), settings_tax_profile_path(settings_tax_profile ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
             </tr>
             <% end %>
           </tbody>

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

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

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

@@ -22,7 +22,7 @@
             <th>Name</th>
             <th>Is active</th>
             <th>Created by</th>
-            <th></th>
+            <th>Action</th>
           </tr>
         </thead>
 

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

@@ -4,7 +4,7 @@
   <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
   <li class="breadcrumb-item active">Details</li>
   <span class="float-right">
-    <%= link_to t('.new', :default => t("views.btn.new")), settings_zones_path %>
+    <%= link_to t("views.btn.back"), settings_zones_path %>
   </span>
 </ul>
 </div>
@@ -22,7 +22,7 @@
               <th>Name</th>
               <th>Is active</th>
               <th>Created by</th>
-              <th></th>
+              <th>Action</th>
             </tr>
           </thead>
 
@@ -60,9 +60,10 @@
               <th>Name</th>
               <th>Type</th>
               <th>Seater</th>
-              <th>Is active</th>
+              <th>Is Active</th>
-              <th>Created by</th>
+              <th>Created By</th>
-              <th></th>
+              <th>Created At</th>
+              <th>Action</th>
             </tr>
           </thead>