UI change

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

@@ -24,14 +24,14 @@
             <th>Show tax</th>
             <th>Show cashier</th>
             <!-- <th>Show guest info</th> -->
-            <th>Action</th>
+            <th>Actions</th>
           </tr>
         </thead>
 
         <tbody>
           <% @settings_cashier_terminals.each do |settings_cashier_terminal| %>
           <tr>
-            <td><%= settings_cashier_terminal.name %></td>
+            <td><%= link_to settings_cashier_terminal.name,settings_cashier_terminal_path(settings_cashier_terminal)  %></td>
             <td><%= settings_cashier_terminal.is_active %></td>
             <td><%= settings_cashier_terminal.is_currently_login %></td>
             <td><%= settings_cashier_terminal.auto_print_receipt %></td>
@@ -40,16 +40,6 @@
             <td><%= settings_cashier_terminal.show_cashier %></td>
             <!-- <td><%= settings_cashier_terminal.show_guest_info %></td> -->
             <td><%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
-               
-               <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(settings_cashier_terminal) %>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
-
-              <span class="hidden" id="delete_text">
-                  <h6>Are you sure you want to delete this row ?</h6>
-                  <h6>This action can't be undo. </h6> 
-              </span>
-
              </td>
            </tr>
            <% end %>

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

@@ -1,13 +1,15 @@
-
 <div class="page-header">
- <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
-  <li>Cashier Terminal</li>
-  <span style="float: right">
-  </span>
- </ul>
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item">Cashier Terminals</li>
+    <li class="breadcrumb-item active">Details</li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminal_path %>
+    </span>
+  </ol>
 </div>
+<br>
+
 <div class="card">
   <div class="card-block">
     <h4 class="card-title">Cashier Terminal</h4>
@@ -22,57 +24,72 @@
         <td><%= @settings_cashier_terminal.is_active %></td>
       </tr>
 
-     <tr>
+      <tr>
         <td><strong>Is currently login:</strong></td>
         <td><%= @settings_cashier_terminal.is_currently_login %></td>
-      </p>
+      </tr>
 
       <tr>
-        <strong>Auto print receipt:</strong>
+        <td><strong>Auto print receipt:</strong></td>
+        <td>
         <%= @settings_cashier_terminal.auto_print_receipt %>
-      </p>
+        </td>
+      </tr>
 
       <tr>
-        <strong>Printer name:</strong>
-        <%= @settings_cashier_terminal.printer_name %>
-      </p>
+        <td><strong>Printer name:</strong></td>
+        <td><%= @settings_cashier_terminal.printer_name %></td>
+      </tr>
 
       <tr>
-        <strong>Header:</strong>
-        <%= @settings_cashier_terminal.header %>
-      </p>
+        <td><strong>Header:</strong></td>
+        <td><%= @settings_cashier_terminal.header %></td>
+      </tr>
 
       <tr>
-        <strong>Footer:</strong>
-        <%= @settings_cashier_terminal.footer %>
-      </p>
+        <td><strong>Footer:</strong></td>
+        <td><%= @settings_cashier_terminal.footer %></td>
+      </tr>
 
       <tr>
-        <strong>Font:</strong>
-        <%= @settings_cashier_terminal.font %>
-      </p>
+        <td><strong>Font:</strong></td>
+        <td><%= @settings_cashier_terminal.font %></td>
+      </tr>
 
       <tr>
-        <strong>Font size:</strong>
-        <%= @settings_cashier_terminal.font_size %>
-      </p>
+        <td><strong>Font size:</strong></td>
+        <td><%= @settings_cashier_terminal.font_size %></td>
+      </tr>
 
       <tr>
-        <strong>Show tax:</strong>
-        <%= @settings_cashier_terminal.show_tax %>
-      </p>
+        <td><strong>Show tax:</strong></td>
+        <td><%= @settings_cashier_terminal.show_tax %></td>
+      </tr>
 
       <tr>
-        <strong>Show cashier:</strong>
-        <%= @settings_cashier_terminal.show_cashier %>
-      </p>
+        <td><strong>Show cashier:</strong></td>
+        <td><%= @settings_cashier_terminal.show_cashier %></td>
+      </tr>
 
       <tr>
-        <strong>Show guest info:</strong>
-        <%= @settings_cashier_terminal.show_guest_info %>
-      </p>
+        <td><strong>Show guest info:</strong></td>
+        <td><%= @settings_cashier_terminal.show_guest_info %></td>
+      </tr>
+
+      <tr>
+        <td colspan="2" align="right">
+          <!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(@settings_cashier_terminal) %>" data-method="delete">
+            <%= t("views.btn.delete") %>
+          </button>
+
+          <span class="hidden" id="delete_text">
+              <h6>Are you sure you want to delete this row ?</h6>
+              <h6>This action can't be undo. </h6> 
+          </span> -->
+          <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
+          <%= link_to t("views.btn.delete"), settings_cashier_terminal_path(@item, @settings_cashier_terminal ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
+        </td>
+      </tr>
     </table>
   </div>
 </div>
-
-</div>

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

@@ -21,7 +21,7 @@
             <th style="width:20%">Role</th>
             <th style="width:20%">Created At</th>
             <th style="width:20%">Updated At</th>
-            <th style="width:20%">Action</th>
+            <th style="width:20%">Actions</th>
           </tr>
         </thead>
 
@@ -34,17 +34,6 @@
             <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
             <td>
             <%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
-              <%if employee.role != "administrator"%>
-
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_employee_path(employee)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
-
-              <span class="hidden" id="delete_text">
-                <h6>Are you sure you want to delete this row ?</h6>
-                <h6>This action can't be undo. </h6> 
-              </span>
-             <%end%>
             </td>
           </tr>
           <% end %>

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

@@ -29,7 +29,7 @@
           <th>Role</th>
           <th>Created At</th>
           <th>Updated At</th>
-          <th>Action</th>
+          <th>Actions</th>
         </tr>
       </thead>
 
@@ -41,6 +41,18 @@
           <td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
               <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %>
+              <%if @employee.role != "administrator"%>
+
+              <!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_employee_path(@employee)%>" data-method="delete">
+                <%= t("views.btn.delete") %>
+              </button>
+
+              <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+              </span> -->
+              <%= link_to t("views.btn.delete"), settings_employee_path(@item, @employee ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
+             <%end%>
           </td>
         </tr>
       </tbody>

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

@@ -36,7 +36,7 @@
                 <td><%= settings_membership_action.merchant_account_id %></td>
                 <td><%= link_to t("views.btn.show"), settings_membership_action_path(settings_membership_action),:class => 'btn btn-info btn-sm waves-effect' %>
                 <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
-                <%= link_to t("views.btn.delete"), settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+                </td>
               </tr>
               <% end %>
             </tbody>

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

@@ -45,7 +45,12 @@
           <th>Additional parameter</th>
           <td><%= @settings_membership_action.additional_parameter %></td>
         </tr>
-       
+        <tr>
+          <td colspan="2" align="right">
+            <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
+            <%= link_to t("views.btn.delete"), settings_membership_action_path(@settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect', :disabled => "disabled" %>
+          </td>
+        </tr>
       </tbody>
     </table>
   </div>

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

@@ -34,7 +34,7 @@
               <th>Is Available</th>
               <th>Order by</th>
               <th>Created At</th>
-              <th>Action</th>
+              <th>Actions</th>
             </tr>
           </thead>
 
@@ -47,6 +47,7 @@
               <td><%= @settings_menu_category.order_by %></td>
               <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></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>
+              <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-sm waves-effect' %></td>
             </tr>
           </tbody>
         </table>
@@ -90,12 +91,12 @@
                 <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 t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                     <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>
                   </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 t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></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

@@ -34,6 +34,7 @@
             <th>Attribute type</th>
             <th>Name</th>
             <th>Value</th>
+            <th>Actions</th>
           </tr>
         </thead>
 
@@ -46,14 +47,14 @@
             <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' %>
               
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_attribute_path(settings_menu_item_attribute)%>" data-method="delete">
+              <!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_attribute_path(settings_menu_item_attribute)%>" data-method="delete">
                 <%= t("views.btn.delete") %>
-              </button>
+              </button> -->
               <!-- Start Delete confirrm text !-->
-              <span class="hidden" id="delete_text">
+              <!-- <span class="hidden" id="delete_text">
                   <h6>Are you sure you want to delete this row ?</h6>
                    <h6>This action can't be undo. </h6> 
-              </span>
+              </span> -->
               </td>
             </tr>
             <% end %>

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

@@ -17,7 +17,7 @@
           <th>Name</th>
           <th>Value</th>
           <th>Created At</th>
-          <th>Action</th>
+          <th>Actions</th>
         </tr>
       </thead>
 
@@ -26,7 +26,9 @@
           <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 t("views.btn.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) %>
+            <%= link_to t("views.btn.delete"), settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %>
+          </td>
         </tr>
       </tbody>
     </table>