merge with origin

app/assets/javascripts/CRM.js

@@ -19,6 +19,7 @@
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require BSBMaterial/admin.js

app/assets/javascripts/application.js

@@ -23,6 +23,7 @@
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require autosize/autosize.js
@@ -35,6 +36,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+
 $(document).on('turbolinks:load', function() {
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
@@ -96,16 +98,11 @@ $(document).on('turbolinks:load', function() {
     }
   });
 
-});
-
-$(document).ready(function() {
-    $('body').bootstrapMaterialDesign();
-});
-
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
 //   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
 //   $('.dropdown-toggle').dropdown();
 // });
+});
 
 function export_to(path)
 {
@@ -114,3 +111,4 @@ function export_to(path)
 }
 
 
+

app/assets/javascripts/custom.js

@@ -25,10 +25,7 @@ $(document).on('turbolinks:load', function() {
   $('.delete').click(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
-    var html_text = $( this ).siblings( "#delete_text" ).html();
+    var html_text = $(this).siblings( "#delete_text" ).html();
-    console.log(method);
-    console.log(url);
-    console.log(html_text);
     swal({
         title: "Confirmation",
         text: html_text,
@@ -50,4 +47,50 @@ $(document).on('turbolinks:load', function() {
     });
   });
 
+  // for Notificaiotn message
+  var placementFrom  = $("#notify_message").attr('data-placement-from');
+  var placementAlign = $("#notify_message").attr('data-placement-align');
+  var animateEnter   = $("#notify_message").attr('data-animate-enter');
+  var animateExit    = $("#notify_message").attr('data-animate-exit');
+  var colorName      = $("#notify_message").attr('data-color-name');
+  var text           = $("#notify_message").attr('data-message');
+  console.log(text);
+  if (text != null || colorName != null){
+     showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+  }
+
+  function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
+    if (colorName === null || colorName === '') { colorName = 'bg-black'; }
+    if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
+    if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
+    var allowDismiss = true;
+    $.notify({
+        message: text
+    },
+        {
+            type: colorName,
+            allow_dismiss: allowDismiss,
+            newest_on_top: true,
+            timer: 1000,
+            placement: {
+                from: placementFrom,
+                align: placementAlign
+            },
+            animate: {
+                enter: animateEnter,
+                exit: animateExit
+            },
+            template: '<div data-notify="container" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+            '<button type="button" aria-hidden="true" class="close float-right m-l-20 m-t--5" data-notify="dismiss">×</button>' +
+            '<span data-notify="icon"></span> ' +
+            '<span data-notify="title">{1}</span> ' +
+            '<span data-notify="message">{2}</span>' +
+            '<div class="progress" data-notify="progressbar">' +
+            '<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
+            '</div>' +
+            '<a href="{3}" target="{4}" data-notify="url"></a>' +
+            '</div>'
+        });
+   }
+  //end Notificaiotn message
 });

app/assets/javascripts/origami.js

@@ -6,6 +6,7 @@
 //= require turbolinks
 //= require cable
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require BSBMaterial/admin.js

app/assets/stylesheets/reset.css

@@ -251,5 +251,13 @@ section.content {
 }
 /* END FORM */
 
+.form-group span.help-block {
+    font-size: 12px;
+    display: block;
+    margin-top: 5px;
+    font-weight: normal;
+    color: #F44336;
+}
+
 /* End Reset Theme */
 /* *************************************************** */

app/controllers/base_origami_controller.rb

@@ -4,9 +4,10 @@ class BaseOrigamiController < ActionController::Base
 
   #before_action :check_installation
   protect_from_forgery with: :exception
-
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
+    puts "ssssssssssss"
+    puts flash
     redirect_to origami_root_path
   end
 

app/controllers/origami/cash_outs_controller.rb

@@ -1,4 +1,4 @@
-class Origami::CashOutsController < ApplicationController#BaseOrigamiController
+class Origami::CashOutsController < BaseOrigamiController
   def new
   end
 

app/controllers/origami/paypar_payments_controller.rb

@@ -1,4 +1,4 @@
-class Origami::PayparPaymentsController < ApplicationController#BaseOrigamiController
+class Origami::PayparPaymentsController < BaseOrigamiController
 	def create
 		sale_id = params[:sale_id]
 		redeem_amount = params[:redeem_amount]

app/controllers/origami/void_controller.rb

@@ -1,4 +1,4 @@
-class Origami::VoidController < ApplicationController
+class Origami::VoidController < BaseOrigamiController
    authorize_resource :class => false
   def overall_void
 

app/controllers/settings/accounts_controller.rb

@@ -27,7 +27,7 @@ class Settings::AccountsController < ApplicationController
   def create
     @settings_account = Account.new(account_params)
     respond_to do |format|
-      if @settings_account.save!
+      if @settings_account.save
         format.html { redirect_to settings_accounts_url, notice: 'Account was successfully created.' }
         format.json { render :index, status: :created, location: @settings_account }
       else

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

@@ -15,14 +15,14 @@
         <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>    
    </div>
   
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+    <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
       <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
       <% flash.each do |test, msg| %>
          <% 
          str="[\"#{msg['name']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-6px"><%= str %></span>
+         <lable class="error" style="margin-top:-6px"><%= str %></lable>
       <% end -%>
     </div>
 
@@ -45,28 +45,28 @@
         <% str="[\"#{msg['company']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-        <span class="help-block" style="margin-top:-6px"><%= str %></span>
+        <lable class="error" style="margin-top:-6px"><%= str %></lable>
       <% end -%>
     </div>
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+    <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
       <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
       
       <%  flash.each do |name, msg| %>
         <% str="[\"#{msg['contact_no']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-        <span class="help-block" style="margin-top:-6px"><%= str %></span>
+        <lable class="error" style="margin-top:-6px"><%= str %></lable>
       <% end %>
     </div>
 
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+    <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
       <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
    
       <% flash.each do |name, msg| %>
          <% str="[\"#{msg['email']}\"]"
             str.gsub!('["', '')
             str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-6px"><%= str %></span>
+         <lable class="error" style="margin-top:-6px"><%= str %></lable>
       <% end %>
     </div>
 
@@ -101,13 +101,13 @@
       <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
     </div>
 
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+    <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
       <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
       <% flash.each do |name, msg| %>
          <% str="[\"#{msg['card_no']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-6px"><%= str %></span>
+         <lable class="error" style="margin-top:-6px"><%= str %></lable>
       <% end %>
     </div>
 

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

@@ -1,5 +1,6 @@
-
+<div class="row">
-<%= simple_form_for([:crm,@dining_queue]) do |f| %>
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <%= simple_form_for([:crm,@dining_queue]) do |f| %>
       <%= f.error_notification %>
       <p class="hidden generate_no"><%= @queue_no  %></p>
       <div class="col-md-6">
@@ -14,10 +15,37 @@
           </div>
           <br>
           <div class="form-actions">
-        <%= f.submit "Create Queue",:class=>"btn btn-primary btn-lg waves-effect"%>
+            <%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue btn-lg waves-effect"%>
           </div>
       </div>
-<% end %>
+    <% end %>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-93 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.queue_no") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.queue_no_txt") %> <br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.contact_no") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.contact_no_txt") %> <br>
+        4) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.seat_txt") %> <br>
+        5) <%= t("views.right_panel.detail.remark") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.remark_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.create") %> <%= t("views.right_panel.button.queue") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.queue_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %> <br>
+        </p>
+      </div>
+    </div> 
+  </div>
+</div>
+
 
 
 <script type="text/javascript">

app/views/layouts/CRM.html.erb

@@ -44,13 +44,21 @@
     <!-- Main Content -->
     <section class="content"> 
         <% flash.each do |type, message| %>
-                <div class="alert-danger fade in">
-                  <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
-
             <% if !flash["errors"]%>
-                   <%=message%>
+                <% 
+                    if type == "notice" 
+                       color = "alert-success"
+                    elsif type == "error"
+                        color = "alert-danger"
+                    else
+                        color = "bg-black"
+                    end 
+                %>
+               
+                <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+                    data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+                </p>
             <% end %> 
-                </div>
         <% end %>       
         <%= yield %>     
     </section>

app/views/layouts/_left_sidebar.html.erb

@@ -167,12 +167,12 @@
 					<span><%= t :payment_methods %></span>
 				</a>
 			</li>
-			<li>
+			<!-- <li>
 				<a href="<%= settings_accounts_path %>">
 					<i class="material-icons col-amber">donut_large</i>
 					<span><%= t :accounts %></span>
 				</a>
-			</li>
+			</li> -->
 			<li>
 				<a href="<%= settings_products_path %>">
 					<i class="material-icons col-brown">donut_large</i>

app/views/layouts/application.html.erb

@@ -43,6 +43,19 @@
 
     <!-- Main Content -->
     <section class="content"> 
+       <% flash.each do |type, message| %>
+          <% if type == "notice" 
+               color = "alert-success"
+            elsif type == "error"
+                color = "alert-danger"
+            else
+                color = "bg-black"
+            end %>
+            
+            <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+                data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+            </p>
+        <% end %>       
         <%= yield %>     
     </section>
 </body>

app/views/layouts/origami.html.erb

@@ -44,13 +44,17 @@
     <!-- Main Content -->
     <section class="content"> 
       <% flash.each do |type, message| %>
-        <% if !flash["errors"]%>
+          <% if type == "notice" 
-          <div class="alert fade in">
+               color = "alert-success"
-            <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
+            elsif type == "error"
-            <%=message%>
+                color = "alert-danger"
-          </div>
+            else
-        <% end %>
+                color = "bg-black"
+            end %>
             
+            <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+                data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+            </p>
         <% end %> 
       <%= yield %>   
     </section>

app/views/print_settings/_form.html.erb

@@ -27,10 +27,30 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.unique_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.unique_code_txt") %> <br>
+        3) <%= t("views.right_panel.detail.template") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.template_txt") %> <br>
+        4) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.font_txt") %> <br>
+        5) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        6) <%= t("views.right_panel.detail.api_settings") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.api_settings_txt") %> <br>
+        7) <%= t("views.right_panel.detail.page_width") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.page_width_txt") %> <br>
+        8) <%= t("views.right_panel.detail.page_height") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.page_height_txt") %> <br>
+        9) <%= t("views.right_panel.detail.print_copies") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.print_copies_txt") %> <br>
+        10) <%= t("views.right_panel.detail.precision") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.checkbox") %> <br>
+        11) <%= t("views.right_panel.detail.delimiter") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.delimiter_txt") %> <br>
+        12) <%= t("views.right_panel.detail.heading_space") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.heading_space_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

app/views/print_settings/index.html.erb

@@ -10,7 +10,7 @@
   </ol>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">   
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">   
     <div class="m-b-10 clearfix">
   <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
 </div>
@@ -58,13 +58,31 @@
     </table>
   </div>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+ <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.unique_code") %> - <%= t("views.right_panel.detail.unique_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        3) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        4) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        5) <%= t("views.right_panel.detail.page_width") %> - <%= t("views.right_panel.detail.page_width_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        6) <%= t("views.right_panel.detail.page_height") %> - <%= t("views.right_panel.detail.page_height_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        7) <%= t("views.right_panel.detail.print_copies") %> - <%= t("views.right_panel.detail.print_copies_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

app/views/print_settings/show.html.erb

@@ -72,10 +72,28 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.unique_code") %> - <%= t("views.right_panel.detail.unique_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        3) <%= t("views.right_panel.detail.template") %> - <%= t("views.right_panel.detail.template_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        4) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.printer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        5) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        6) <%= t("views.right_panel.detail.api_settings") %> - <%= t("views.right_panel.detail.api_settings_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        7) <%= t("views.right_panel.detail.page_width") %> - <%= t("views.right_panel.detail.page_width_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        8) <%= t("views.right_panel.detail.page_height") %> - <%= t("views.right_panel.detail.page_height_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        9) <%= t("views.right_panel.detail.print_copies") %> - <%= t("views.right_panel.detail.print_copies_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -3,8 +3,8 @@
    <%= simple_form_for([:settings,@settings_account]) do |f| %>
    <%= f.error_notification %>
    <div class="form-inputs p-l-10">
-    <%= f.input :title ,:input_html=>{:class=>"col-md-10"}%>
+    <%= f.input :title ,:input_html=>{:class=>"col-md-10"},:required=>true%>
-    <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"} %>
+    <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"},:required=>true %>
     <%= f.input :discount %>
     <%= f.input :point %>
     <%= f.input :bonus %>
@@ -18,10 +18,24 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.title_txt") %> <br>
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.account_type_txt") %> <br>
+        3) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
+        4) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+        5) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        6) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
     </div>
   </div>  
 </div>

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

@@ -23,8 +23,7 @@
             <th>Point</th>
             <th>Bonus</th>
             <th>Rebate</th>
-
+            <th style="">Actions</th>
-            <th style="">Action</th>
           </tr>
         </thead>
 
@@ -50,12 +49,27 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <br>
-        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+          3) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
-        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+          4) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+          5) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+          6) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+          7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+          </p>
       </div>
     </div>  
   </div>

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

@@ -2,16 +2,19 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_account_path %>">Account</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_account_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
     </span>
   </ol>
 </div>
 
 <br/>
-<div class="card">
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
       <div class="card-block">
         <h4 class="card-title">Account</h4>
         <table class="table">
@@ -23,7 +26,7 @@
               <th>Can get Points</th>
               <!-- <th>Can get Bonus</th> -->
               <th>Can rebate</th>
-          <th>Action</th>
+              <th>Actions</th>
             </tr>
           </thead>
 
@@ -50,4 +53,32 @@
           </tbody>
         </table>
       </div>
+    </div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <br>
+        3) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+        4) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+      </div>
+    </div>  
+  </div>
 </div>
+

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

@@ -26,10 +26,29 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %> <br>
+        4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %> <br>
+        5) <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        7) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        8) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        9) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
+        10) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
+        11) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -52,10 +52,27 @@
    <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        3) <%= t("views.right_panel.detail.login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.login_txt") %> <br>
+        4) <%= t("views.right_panel.detail.auto_print") %> - <%= t("views.right_panel.detail.auto_print_txt") %> <br>
+        5) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
+        6) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
+        7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -4,13 +4,15 @@
     <li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Cashier Terminals</a></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 %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %>
     </span>
   </ol>
 </div>
 <br>
 
-<div class="card">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
       <div class="card-block">
         <h4 class="card-title">Cashier Terminal</h4>
         <table class="table">
@@ -92,4 +94,40 @@
           </tr>
         </table>
       </div>
+    </div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+          3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %> <br>
+          4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %> <br>
+          5) <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+          6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+          7) <%= t("views.right_panel.detail.header") %> - <%= t("views.right_panel.detail.header_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+          8) <%= t("views.right_panel.detail.footer") %> - <%= t("views.right_panel.detail.footer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+          9) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+          10) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+          11) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
+          12) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
+          13) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
+        </p>
+      </div>
+    </div> 
+  </div>
 </div>
+

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

@@ -29,10 +29,24 @@
  <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.joined_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.joined_date_txt") %> <br>
+        5) <%= t("views.right_panel.detail.resigned_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.resigned_date_txt") %> <br>
+        6) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.active_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -49,10 +49,27 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.joined_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.joined_date_txt") %> <br>
+        5) <%= t("views.right_panel.detail.resigned_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.resigned_date_txt") %> <br>
+        6) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -20,7 +20,9 @@
 </ul>
 <!-- Nav tabs - End -->
 
-<div class="tab-content">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="tab-content">
       <!--- Panel 0 - Info -->
       <div class="tab-pane active" id="info" role="tabpanel" style="max-height:670px; overflow:auto">
         <div class="card">
@@ -100,6 +102,48 @@
 
       <br/>
 
+    </div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5>INFO</h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        2) <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.joined_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.joined_date_txt") %> <br>
+        5) <%= t("views.right_panel.detail.resigned_date") %> - <%= t("views.right_panel.detail.commissioner_txt") %> <%= t("views.right_panel.detail.resigned_date_txt") %> <br>
+        6) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+        ----------------------------------------------------------------
+        <h5>TRANSACTION</h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
+        2) <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.qty") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.qty_txt") %> <br>
+        4) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.price_txt") %> <br>
+        5) <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.amount_txt") %> <br>
+        6) <%= t("views.right_panel.detail.date") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.date_txt") %> <br>
+        </p>
+
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.commissioner_txt") %> <br>
+        </p>
+      </div>
+    </div>
+  </div>
 </div>
 
 <script type="text/javascript">

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

@@ -23,10 +23,22 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      <p>
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      1) <%= t("views.right_panel.detail.product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      2) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+      3) <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.amount_txt") %> <br>
+      4) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.active_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>

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

@@ -43,10 +43,25 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+        3) <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.amount_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        4) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commission</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %>
     </span>
   </ol>
 </div>
@@ -53,10 +53,23 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      <p>
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      1) <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      2) <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.amount_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      3) <%= t("views.right_panel.detail.commission_type") %> - <%= t("views.right_panel.detail.commission_type_txt") %> <br>
+      4) <%= t("views.right_panel.detail.active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.commission_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>

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

@@ -10,7 +10,14 @@
         <% end %>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
+    <% if @table %>
+        <%= link_to t('.back', :default => t("views.btn.back")), edit_settings_zone_table_path(@zone,@settings_dining_facility) %>
+          
+        <% elsif @room %>
+        <%= link_to t('.back', :default => t("views.btn.back")), edit_settings_zone_room_path(@zone,@settings_dining_facility) %>
+           
+        <% end %>
+
     </span>
   </ol>
 </div>

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

@@ -19,10 +19,22 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.role") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.role_txt") %> <br>
+          3) <%= t("views.right_panel.detail.employee_numeric_id") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.employee_numeric_id_txt") %> <br>
+          4) <%= t("views.right_panel.detail.password") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.password_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+          </p>
       </div>
     </div>  
   </div>

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

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

@@ -44,10 +44,24 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.role") %> - <%= t("views.right_panel.detail.role_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        3) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        4) <%= t("views.right_panel.detail.updated_at") %> - <%= t("views.right_panel.detail.updated_at_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -10,7 +10,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item">Employees</li>
+    <li class="breadcrumb-item"><a href="<%= settings_employees_path %>">Employees</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %>
@@ -69,10 +69,25 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      <p>
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      2) <%= t("views.right_panel.detail.role") %> - <%= t("views.right_panel.detail.role_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      3) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      4) <%= t("views.right_panel.detail.updated_at") %> - <%= t("views.right_panel.detail.updated_at_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      <%if @employee.role != "administrator"%>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      <% end %>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>

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

@@ -4,7 +4,7 @@
     <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("views.btn.back"), settings_menus_path %>
+      <%= link_to t("views.btn.back"), dashboard_path %>
     </span>
   </ol>
 </div>

app/views/settings/membership_settings/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("views.btn.new"),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+      <%= link_to t("views.btn.new"),new_settings_membership_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </div>
     <div class="card">
       <table class="table table-striped">
@@ -20,7 +20,7 @@
             <th>Membership type</th>
             <th>Is active</th>
             <th>Gateway communication type</th>
-            <th>Gateway url</th>
+            <!-- <th>Gateway url</th> -->
         <!-- <th>Auth token</th>
         <th>Merchant account</th> -->
         <th>Discount</th>
@@ -37,7 +37,7 @@
         <td><%= link_to settings_membership_setting.membership_type, edit_settings_membership_setting_path(settings_membership_setting) %></td>
         <td><%= settings_membership_setting.is_active %></td>
         <td><%= settings_membership_setting.gateway_communication_type %></td>
-        <td><%= settings_membership_setting.gateway_url %></td>
+        <!-- <td><%= settings_membership_setting.gateway_url %></td> -->
           <!-- <td><%= settings_membership_setting.auth_token %></td>
           <td><%= settings_membership_setting.merchant_account rescue ''%></td> -->
           <td><%= settings_membership_setting.discount %></td>

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

@@ -13,6 +13,7 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
      <ul class="list-group">
+       <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
        <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
        <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
        <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
@@ -118,7 +119,7 @@
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
-        <h5><%= t("views.right_panel.header.menu_categories") %></h5>
+        <h5><%= t("views.right_panel.header.menu_category") %></h5>
         <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
           1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
@@ -134,7 +135,6 @@
           1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
           2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
         </p>
-
       <h5><%= t("views.right_panel.header.menu_items") %></h5>
       <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
       <p>
@@ -143,7 +143,7 @@
       3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
       4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
       5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %> <br>
-      6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+      6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
       </p>
       <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
       <p>

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

@@ -82,7 +82,12 @@
           <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
           <p>
             1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
-            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+            4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+            5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+            6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+            7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
           </p>
         </div>
       </div>  

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

@@ -28,7 +28,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 t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute),:class=>"btn btn-info btn-sm waves-effect" %>
+              <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">
                   <%= t("views.btn.delete") %>
                 </button>
@@ -47,10 +47,23 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %><br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.value_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        3) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -18,10 +18,21 @@
 	<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 		<div class="card">
 			<div class="body">
-				Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+				<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-				tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+		        <p>
-				quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+		        1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br> 
-				consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+		        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+		        3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.value_txt") %> <br>
+		        </p>
+		        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+		        <p>
+		        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+		        </p>
+		        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+		        <p>
+		          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+		          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+		        </p>
 			</div>
 		</div>  
 	</div>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item active">Menu Category</li>
+    <li class="breadcrumb-item active">Menu Item Options</li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -11,8 +11,8 @@
 <div class="row">
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
-
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
@@ -21,11 +21,12 @@
      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
    </div>
-</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
+
+   <h4 class="card-title">Menu Item Options
     <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </h4>
     <hr>
@@ -58,12 +59,31 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.value_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+          5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
+
 </div>
 
+

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

@@ -33,7 +33,7 @@
               <td><%= @settings_menu_item_option.value  rescue "-" %></td>
               <td><%=l @settings_menu_item_option.created_at, format: :short %></td>
               <td>
-                <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option),:class=>"btn btn-info btn-sm waves-effect"%>
+                <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option),:class => 'btn btn-primary btn-sm waves-effect' %>
                 <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_option_path(@settings_menu_item_option)%>" data-method="delete">
                   <%= t("views.btn.delete") %>
                 </button> 
@@ -52,10 +52,24 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_options_txt") %><br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_options_txt") %><br> 
+        3) <%= t("views.right_panel.detail.value") %> - <%= t("views.right_panel.detail.value_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        4) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -12,6 +12,7 @@
    <br><br>
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

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

@@ -12,7 +12,7 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
@@ -20,7 +20,6 @@
      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
-    </ul>
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">

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

@@ -34,10 +34,26 @@ div.form-inputs span{
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.station_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.station_name_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        4) <%= t("views.right_panel.detail.print_copy") %> - <%= t("views.right_panel.detail.copy_print_txt") %> <br>
+        5) <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        6) <%= t("views.right_panel.detail.cut_per_print") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cut_per_item_txt") %> <br>
+        7) <%= t("views.right_panel.detail.alternate_name") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+        8) <%= t("views.right_panel.detail.auto_print") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -12,7 +12,7 @@
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
   <div class="m-b-10 clearfix">
   <%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
 </div>
@@ -61,20 +61,30 @@
       <%= paginate @settings_order_queue_stations %>
     </div>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+ <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
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.station_name") %> -  <%= t("views.right_panel.detail.station_name_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.station_name_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %><br>
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+          3) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.order_queue_stations_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          4) <%= t("views.right_panel.detail.auto_print") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_txt") %><br>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          5) <%= t("views.right_panel.detail.print_copy") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.copy_print_txt") %><br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+          6) <%= t("views.right_panel.detail.alternate_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %><br>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          7) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %><br>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+          3) <%= t("views.right_panel.button.assign_processing_items") %> - <%= t("views.right_panel.detail.assign_processing_items_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
       </div>
     </div>  
   </div>

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

@@ -82,10 +82,29 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.station_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.station_name_txt") %><br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.auto_print") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_txt") %> <br>
+        4) <%= t("views.right_panel.detail.processing_items") %> - <%= t("views.right_panel.detail.number_of") %> <%= t("views.right_panel.detail.processing_items_txt") %> <br>
+        5) <%= t("views.right_panel.detail.print_copy") %> - <%= t("views.right_panel.detail.copy_print_txt") %> <br>
+        6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
+        7) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <br>
+        8) <%= t("views.right_panel.detail.cut_per_print") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cut_per_item_txt") %> <br>
+        9) <%= t("views.right_panel.detail.alternate_name") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+        10) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -22,10 +22,25 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.payment_method") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.comm_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_txt") %> <%= t("views.right_panel.detail.comm_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_txt") %> <%= t("views.right_panel.detail.url_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %>  <br>
+        6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.merchant_account_txt") %>  <br>
+        7) <%= t("views.right_panel.detail.additional_parameters") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.additional_parameters_txt") %>  <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -60,10 +60,25 @@
     <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
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+          <p>
-          quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.payment_method") %> - <%= t("views.right_panel.detail.payment_method_txt") %> <br>
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+          3) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.comm_type") %> - <%= t("views.right_panel.detail.comm_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.gateway_txt") %> <br>
+          4) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %> - <%= t("views.right_panel.detail.url_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.gateway_txt") %> <br>
+          5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+          2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+          </p>
         </div>
       </div>  
     </div>

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

@@ -65,10 +65,25 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.payment_method") %> - <%= t("views.right_panel.detail.payment_method_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.comm_type") %> - <%= t("views.right_panel.detail.comm_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.gateway_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %> - <%= t("views.right_panel.detail.url_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.gateway_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.auth_token_txt") %> <br>
+        6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -64,10 +64,21 @@
  <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.select_menu_items") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <button type="button" class="btn btn-info waves-effect processingitems_all"> <i class="material-icons md-18">list </i> </button> - <%= t("views.right_panel.detail.assign_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        3) <button type="button" class="btn btn-info waves-effect processingitems_all"> <i class="material-icons md-18">remove_circle </i></button> - <%= t("views.right_panel.detail.remove_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.update") %> - <%= t("views.right_panel.detail.update_btn_txt") %> <%= t("views.right_panel.detail.processing_items_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -37,10 +37,27 @@
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+        4) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <br>
+        5) <%= t("views.right_panel.detail.description") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.description_txt") %> <br>
+        6) <%= t("views.right_panel.detail.information") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.information_txt") %> <br>
+        7) <%= t("views.right_panel.detail.taxable") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %> <br>
+        8) <%= t("views.right_panel.detail.product_image") %> - <%= t("views.right_panel.detail.image_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %>  <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.button.pick_image") %> - <%= t("views.right_panel.detail.image_btn_txt") %> <%= t("views.right_panel.detail.image_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -53,10 +53,27 @@
  <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+          4) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          5) <%= t("views.right_panel.detail.description") %> - <%= t("views.right_panel.detail.description_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          6) <%= t("views.right_panel.detail.information") %> - <%= t("views.right_panel.detail.information_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.taxable_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+          </p>
       </div>
     </div>  
   </div>

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

@@ -49,10 +49,27 @@
  <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.product_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <br>
+        4) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        5) <%= t("views.right_panel.detail.product_image") %> - <%= t("views.right_panel.detail.image_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        6) <%= t("views.right_panel.detail.description") %> - <%= t("views.right_panel.detail.description_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        7) <%= t("views.right_panel.detail.information") %> - <%= t("views.right_panel.detail.information_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        8) <%= t("views.right_panel.detail.is_taxable") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -149,13 +149,15 @@
         </div>
         <br>
             <div class="card">
+            <div class="p-l-25 p-t-10 ">
               <div class="row">
-                <div class="col-md-4" style="text-align:center">Item Code</div>
+                <div class="col-md-3" style="text-align:">Item Code</div>
-                <div class="col-md-2" style="text-align:center">Min Qty</div>
+                <div class="col-md-2" style="text-align:">Item Instance</div>
-                <div class="col-md-2" style="text-align:center">Net off</div>
+                <div class="col-md-1" style="text-align:">Min Qty</div>
-                <div class="col-md-2" style="text-align:center">Net Price</div>
+                <div class="col-md-1" style="text-align:">Net off</div>
-                <div class="col-md-1" style="text-align:center">Percentage</div>
+                <div class="col-md-2" style="text-align:">Net Price</div>
-                <div class="col-md-1" style="text-align:center"></div>
+                <div class="col-md-2" style="text-align:">Percentage</div>
+                <div class="col-md-1" style="text-align:"></div>
               </div>
               <div class="row"></div >
               <%= f.fields_for :promotion_products do |pro| %>
@@ -165,7 +167,7 @@
                   <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
                     <% arr.push(p) %>
                   <% end %>
-                <div class="col-md-2 menu_item_choose" style="text-align:left">
+                  <div class="col-md-3 menu_item_choose" style="text-align:">
                     <select class="form-control item_code_place1">
                       <option value="">Choose Something</option>
                       <% arr.each do |a| %>
@@ -175,17 +177,23 @@
                   </div>
                   <!-- <% sample = [] %> -->
 
-                <div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %></div>
+                  <div class="col-md-2" style="text-align:">
+                      <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
+                  </div>
 
-                <div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
+                  <div class="col-md-1"><%= pro.input :min_qty , label: false%></div>
-                <div class="col-md-2"><%= pro.input :net_off , label: false %></div>
+                  <div class="col-md-1"><%= pro.input :net_off , label: false %></div>
                   <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
-                <div class="col-md-1"><%= pro.input :percentage , label: false %></div>
+                  <div class="col-md-2"><%= pro.input :percentage , label: false %></div>
-                <div class="col-md-1" style="text-align:right"><%= pro.link_to_remove "X" %></div>
+                  <div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div>
               </div>
               <% end %>
               <div class="row">
-                <div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary addProduct' %></div>
+                <div class="col-md-12" style="text-align:right;margin-right: 
+                10px;">
+                <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn bg-teal addProduct m-r-20' %> 
+                </div>
+              </div>
               </div>
             </div>
     </div>
@@ -193,17 +201,44 @@
 
   <br>
   <div class="form-actions">
-    <%= f.button :submit %>
+     <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </div>
 <% 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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.promotion_code_txt") %> <br>
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.start_date_txt") %> <br>
+        3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.end_date_txt") %> <br>
+        4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.start_time_txt") %> <br>
+        5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.end_time_txt") %> <br>
+        6) <%= t("views.right_panel.detail.promotion_day") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.promotion_day_txt") %> <br>
+        7) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
+        8) <%= t("views.right_panel.detail.item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
+        9) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.original_product_txt") %> <br>
+        10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %>
+        --------------------------------------------------------------------------------
+        <h5>ADD PRODUCT</h5>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> <br>
+        3) <%= t("views.right_panel.detail.net_off") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.net_off_txt") %> <br>
+        4) <%= t("views.right_panel.detail.net_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.net_price_txt") %> <br>
+        5) <%= t("views.right_panel.detail.percentage") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.percentage_txt") %> <br>
+        6) " X " - <%= t("views.right_panel.detail.remove_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.add_product") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -27,7 +27,7 @@
             <th>Original Product</th>
             <th>Created By</th>
             <th>Created At</th>
-            <th colspan=""></th>
+            <th colspan="2">Actions</th>
           </tr>
         </thead>
 
@@ -55,15 +55,7 @@
             <td><%= pro.created_by %></td>
             <% end %>
             <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro) %>
+            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-info btn-sm waves-effect' %>
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_promotion_path(pro)%>" 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 %>
@@ -74,10 +66,29 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.promotion_code_txt") %> <%= t("views.right_panel.detail.promotion_txt2") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        6) <%= t("views.right_panel.detail.promotion_day") %> - <%= t("views.right_panel.detail.promotion_day_txt") %> <br>
+        7) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.original_product_txt") %> <br>
+        8) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        9) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        10) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -14,29 +14,52 @@
     <div class="card-block">
       <h4 class="card-title">Promotion</h4>
       <table class="table">
-
         <tbody>
-
           <tr><td style="width:20%">Promotion code</td><td><%= @promotion.promo_code  %></td></tr>
           <tr><td style="width:20%">Promotion Start Date</td><td><%= @promotion.promo_start_date %></td></tr>
           <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 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>
       </table>
+
+      <div class="row">
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8" align="right">
+          <%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion),:class => 'btn btn-info btn-sm waves-effect' %>
+          <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_promotion_path(@promotion)%>" 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>
+        </div>
+      </div>
     </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
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      <p>
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.promotion_code_txt") %> <%= t("views.right_panel.detail.promotion_txt2") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
     </div>
   </div>  
 </div>

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

@@ -21,31 +21,26 @@
         <%  @settings_room.dining_charges.each do |dc| %>
         
         <div class="card">
-            <div class="col-md-7">
+            <div class="col-md-">
               <table class="table">
                 <tr><td colspan="2">
                   <div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
                 </tr>
                 <tr>
-                  <td>Item code :</td>
+                  <td class="align-right">Item code :</td>
-                  <td><%= dc.item_code %></td>
+                  <td class="align-left"><%= dc.item_code %></td>
-                </tr>
+                  <td class="align-right">Unit price : </td>
-                <tr>
+                  <td class="align-left"><%= dc.unit_price %></td>
-                  <td>Unit price : </td>
+                  <td class="align-right">Charge type : </td>
-                  <td><%= dc.unit_price %></td>
+                  <td class="align-left"><%= dc.charge_type %></td>
-                </tr>
-                <tr>
-                  <td>Charge type : </td>
-                  <td><%= dc.charge_type %></td>
-                </tr>
-                <tr>
                   <td>
                        <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn bg-deep-purple' %>
                 <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc) %>">Edit Charge</button> -->
                       
                     </td>
-                    <td></td>
                 </tr>
+                
+             
                 </table>
               </div>
           </div>

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

@@ -54,10 +54,28 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        5) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        6) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -22,9 +22,10 @@
             <th>Room</th>
             <th>Seater</th>
             <th>Order by</th>
-            <th>is Active</th>
+            <th>Is Active</th>
             <th>Created By</th>
             <th>Created At</th>
+            <th>Actions</th>
           </tr>
         </thead>
 
@@ -43,7 +44,14 @@
             <% end %>
             <td><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
             <td><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,@room),:class => 'btn btn-primary btn-sm waves-effect' %>
-              <%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_room_path(@zone,@room)%>" 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> 
             </tr>
           </tbody>
         </table>
@@ -53,10 +61,28 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.room_txt") %><br> 
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+        3) <%= t("views.right_panel.detail.room_txt") %> - <%= t("views.right_panel.detail.room_txt") %>  <br>
+        4) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        5) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        6) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.room_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        8) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        9) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.room_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -13,6 +13,7 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

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

@@ -14,6 +14,7 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

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

@@ -24,22 +24,16 @@
                   <div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
                 </tr>
                 <tr>
-                  <td>Item code :</td>
+                  <td class="align-right">Item code :</td>
-                  <td><%= dc.item_code %></td>
+                  <td class="align-left"><%= dc.item_code %></td>
-                </tr>
+                  <td class="align-right">Unit price : </td>
-                <tr>
+                  <td class="align-left"><%= dc.unit_price %></td>
-                  <td>Unit price : </td>
+                  <td class="align-right">Charge type : </td>
-                  <td><%= dc.unit_price %></td>
+                                    <td class="align-left"><%= dc.charge_type %></td>
-                </tr>
-                <tr>
-                  <td>Charge type : </td>
-                  <td><%= dc.charge_type %></td>
-                </tr>
-                <tr>
                    <td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
                     <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
-                    <td></td>
                 </tr>
+                
                 </table>
               </div>
           </div>

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

@@ -55,17 +55,28 @@
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+       <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) Name - to write zone name <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
-        2) Is active - checkbox for is active or not <br>
+        2) <%= t("views.right_panel.detail.status") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        3) <%= t("views.right_panel.detail.seater") %> - <%= t("views.right_panel.detail.seat_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        5) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.table_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        6) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) CREATE ZONE - to create zone <br>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.table_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
         </p>
-        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
-        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>

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

@@ -20,10 +20,22 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.rate") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.rate_txt") %> <br>
+        3) <%= t("views.right_panel.detail.inclusive") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.inclusive_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.order_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -45,10 +45,26 @@
   <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
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        <p>
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.tax_profiles_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        2) <%= t("views.right_panel.detail.rate") %> - <%= t("views.right_panel.detail.rate_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        3) <%= t("views.right_panel.detail.inclusive") %> - <%= t("views.right_panel.detail.inclusive_txt") %> <%= t("views.right_panel.detail.tax_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        5) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -9,7 +9,9 @@
   </ol>
 </div>
 
-<div class="card">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="card">
       <div class="card-block">
         <h4 class="card-title">Tax Profiles</h4>
         <table class="table">
@@ -53,4 +55,32 @@
         </tr>
       </table>
       </div>
+    </div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.tax_profiles_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        2) <%= t("views.right_panel.detail.rate") %> - <%= t("views.right_panel.detail.rate_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        3) <%= t("views.right_panel.detail.inclusive") %> - <%= t("views.right_panel.detail.inclusive_txt") %> <%= t("views.right_panel.detail.tax_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        5) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.tax_profiles_txt") %> <br>
+        </p>
+      </div>
+    </div>
+  </div>
 </div>
+

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

@@ -24,12 +24,12 @@
         </p>
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         </p>
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
         <p>
           1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
-          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.detail_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         </p>
       </div>
     </div>  

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

@@ -52,10 +52,10 @@
           <i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>          
         </h5>
         <p>
-        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
         3) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.created_by_txt") %> <br>
-        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
+        4) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
         </p>
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>

config/locales/en.yml

@@ -112,12 +112,14 @@ en:
         dining_facilities: "Dining Facilities"
         menu: "Menu"
         menu_categories: "Menu Categories"
+        menu_category: "Menu Category"
         menu_items: "Menu Items"
         menu_item_instances: "Menu Item Instances"
       button:
         new: "NEW"
         create: "CREATE"
         show: "SHOW"
+        update: "UPDATE"
         edit: "EDIT"
         delete: "DELETE"
         new_table: "NEW TABLE"
@@ -134,6 +136,9 @@ en:
         new_set_menu_item: "NEW SET MENU ITEM"
         pick_image: "PICK IMAGE"
         cancel: "CANCEL"
+        assign_processing_items: "ASSIGN PROCESSING ITEMS"
+        add_product: "ADD PRODUCT"
+        queue: "QUEUE"
       detail:
         name: "Name"
         type: "Type"
@@ -144,6 +149,7 @@ en:
         account: "Account"
         created_by: "Created by"
         created_at: "Created at"
+        updated_at: "Updated at"
         actions: "Actions"
         item_code: "Item code"
         unit_price: "Unit price"
@@ -184,6 +190,75 @@ en:
         min_selectable_qty: "Min selectable qty"
         max_selectable_qty: "Max selectable qty"
         value: "Value"
+        station_name: "Station name"
+        printer_name: "Printer name"
+        auto_print: "Auto print"
+        print_copy: "Print copy"
+        alternate_name: "Alternate name"
+        processing_items: "Processing items"
+        font_size: "Font size"
+        cut_per_print: "Cut per print"
+        select_menu_items: "Select Menu Items"
+        employee: "Employee"
+        role: "Role"
+        employee_numeric_id: "Employee Numeric ID"
+        password: "Password"
+        login: "Login"
+        show_tax: "Show tax"
+        show_cashier: "Show cashier"
+        is_currently_login: "Is currently login"
+        auto_print_receipt: "Auto print receipt"
+        font: "Font"
+        show_guest_info: "Show guest info"
+        header: "Header"
+        footer: "Footer"
+        unique_code: "Unique code"
+        page_width: "Page width"
+        page_height: "Page height"
+        print_copies: "Print copies"
+        template: "Template"
+        api_settings: "Api settings"
+        precision: "Precision"
+        delimiter: "Delimiter"
+        heading_space: "Heading space"
+        rate: "Rate"
+        inclusive: "Inclusive"
+        payment_method: "Payment method"
+        gateway: "Gateway"
+        comm_type: "Comm type"
+        auth_token: "Auth token"
+        merchant_account: "Merchant account"
+        additional_parameters: "Additional parameters"
+        title: "Title"
+        discount: "Discount"
+        point: "Point"
+        bonus: "Bonus"
+        rebate: "Rebate"
+        description: "Description"
+        information: "Information"
+        product_image: "Product Image"
+        promotion_code: "Promotion Code"
+        start_date: "Start Date"
+        end_date: "End Date"
+        start_time: "Start Time"
+        end_time: "End Time"
+        promotion_day: "Promotion Day"
+        original_product: "Original Product"
+        item: "Item"
+        net_off: "Net off"
+        net_price: "Net price"
+        percentage: "Percentage"
+        product: "Product"
+        commission_type: "Commission Type"
+        amount: "Amount"
+        active: "Active"
+        joined_date: "Joined Date"
+        resigned_date: "Resigned Date"
+        qty: "Qty"
+        date: "Date"
+        queue_no: "Queue no"
+        contacct_no: "Contact no"
+        remark: "Remark"
         
         code_txt: "code "
         charge_txt: "charge"
@@ -210,6 +285,7 @@ en:
         actions_txt3: "user can change "
         status_txt: " is available or not"
         created_at_txt: "datetime for created "
+        updated_at_txt: "datetime for updated "
         item_code_txt: "generated item code for "
         taxable_txt: " taxable or not"
         minimum_free_time_txt: "minimum time for free"
@@ -224,6 +300,7 @@ en:
         valid_to_txt: "valid to/end time "
         select_txt: "select"
         sub_categories_txt: "sub categories"
+        item_txt: "item"
         items_txt: "items"
         alt_name_txt: "alt name"
         parent_txt: "parent"
@@ -251,16 +328,97 @@ en:
         max_selectable_qty_txt: "max selectable qty"
         value_txt: "value"
         type_txt2: "user can view type"
+        order_queue_stations_txt: "order queue stations"
+        station_name_txt: "station"
+        printer_txt: "printer"
+        auto_print_txt: "auto print"
+        status_txt2: "status"
+        copy_print_txt: "copy print"
+        assign_processing_items_txt: "assign processing items"
+        processing_items_txt: "processing items"
+        cut_per_item_txt: "cut per item"
+        font_size_txt: "font size"
+        employee_txt: "employee"
+        role_txt: "role"
+        employee_numeric_id_txt: "employee numeric id"
+        password_txt: "password"
+        cashier_terminal_txt: "cashier terminal"
+        login_txt: "login"
+        tax_txt: "tax"
+        cashier_txt: "cashier"
+        is_currently_login_txt: "is currently login"
+        auto_print_receipt_txt: "auto print receipt"
+        font_txt: "font"
+        guest_info_txt: "guest info"
+        header_txt: "header"
+        footer_txt: "footer"
+        unique_code_txt: "unique code"
+        page_width_txt: "page width"
+        page_height_txt: "page height"
+        print_copies_txt: "print copies"
+        print_settings_txt: "print settings"
+        template_txt: "template"
+        api_settings_txt: "api settings"
+        delimiter_txt: "delimiter"
+        heading_space_txt: "heading space"
+        tax_profiles_txt: "tax profiles"
+        inclusive_txt: "inclusive"
+        rate_txt: "rate"
+        gateway_txt: "gateway"
+        payment_method_txt: "payment method"
+        comm_type_txt: "comm Type"
+        url_txt: "url"
+        auth_token_txt: "auth token"
+        merchant_account_txt: "merchant account"
+        additional_parameters_txt: "additional parameters"
+        title_txt: "title"
+        account_txt: "account"
+        discount_txt: "discount"
+        point_txt: "point"
+        bonus_txt: "bonus"
+        rebate_txt: "rebate"
+        product_txt: "product"
+        description_txt: "description"
+        information_txt: "information"
+        promotion_txt: "promotion"
+        promotion_txt2: "/ user can view"
+        promotion_code_txt: "promotion code"
+        start_date_txt: "start date"
+        end_date_txt: "end date"
+        start_time_txt: "start time"
+        end_time_txt: "end time"
+        promotion_day_txt: "promotion day"
+        original_product_txt: "original product"
+        net_off_txt: "net off"
+        net_price_txt: "net price"
+        percentage_txt: "percentage"
+        commission_txt: "commission"
+        product_txt: "product"
+        commission_type_txt: "commission type"
+        amount_txt: "amount"
+        active_txt: "active"
+        commissioner_txt: "commissioner"
+        joined_date_txt: "joined date"
+        resigned_date_txt: "resigned date"
+        qty_txt: "qty"
+        date_txt: "date"
+        queue_txt: "queue"
+        queue_no_txt: "queue no"
+        contacct_no_txt: "contact no"
+        remark_txt: "remark"
+
+        assign_txt: "to assign "
+        remove_txt: "to remove "
 
         cancel_btn_txt: "to cancel "
         image_btn_txt: "to upload "
         create_btn_txt: "to create "
         submit_btn_txt: "to change "
-        new_btn_txt: "to add new "
+        new_btn_txt: "to add "
         show_btn_txt: "to view "
         edit_btn_txt: "to edit "
         delete_btn_txt: "to delete "
-
+        update_btn_txt: "to update "
   helpers:
     page_entries_info:
       one_page: