From 51dbb321a299f90b6e2295e9ce6f3c5cc93de974 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 26 Oct 2017 16:19:23 +0630
Subject: [PATCH] add right panel text for settings and CRM/queue

---
 app/views/crm/dining_queues/_form.html.erb    |  62 ++++--
 app/views/print_settings/_form.html.erb       |  28 ++-
 app/views/print_settings/index.html.erb       |  30 ++-
 app/views/print_settings/show.html.erb        |  26 ++-
 app/views/settings/accounts/_form.html.erb    |  22 ++-
 app/views/settings/accounts/index.html.erb    |  30 ++-
 app/views/settings/accounts/show.html.erb     | 101 ++++++----
 .../settings/cashier_terminals/_form.html.erb |  27 ++-
 .../settings/cashier_terminals/index.html.erb |  25 ++-
 .../settings/cashier_terminals/show.html.erb  | 172 +++++++++-------
 .../settings/commissioners/_form.html.erb     |  22 ++-
 .../settings/commissioners/index.html.erb     |  25 ++-
 .../settings/commissioners/show.html.erb      | 186 +++++++++++-------
 app/views/settings/commissions/_form.html.erb |  20 +-
 app/views/settings/commissions/index.html.erb |  23 ++-
 app/views/settings/commissions/show.html.erb  |  21 +-
 app/views/settings/employees/_form.html.erb   |  20 +-
 app/views/settings/employees/index.html.erb   |  22 ++-
 app/views/settings/employees/show.html.erb    |  23 ++-
 .../payment_method_settings/_form.html.erb    |  23 ++-
 .../payment_method_settings/index.html.erb    |  23 ++-
 .../payment_method_settings/show.html.erb     |  23 ++-
 app/views/settings/products/_form.html.erb    |  25 ++-
 app/views/settings/products/index.html.erb    |  25 ++-
 app/views/settings/products/show.html.erb     |  25 ++-
 app/views/settings/promotions/_form.html.erb  |  35 +++-
 app/views/settings/promotions/index.html.erb  |  39 ++--
 app/views/settings/promotions/show.html.erb   |  43 +++-
 app/views/settings/rooms/index.html.erb       |  26 ++-
 app/views/settings/rooms/show.html.erb        |  38 +++-
 app/views/settings/tables/index.html.erb      |  25 ++-
 .../settings/tax_profiles/_form.html.erb      |  20 +-
 .../settings/tax_profiles/index.html.erb      |  24 ++-
 app/views/settings/tax_profiles/show.html.erb | 104 ++++++----
 app/views/settings/zones/index.html.erb       |   4 +-
 config/locales/en.yml                         | 137 ++++++++++++-
 36 files changed, 1150 insertions(+), 374 deletions(-)

diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb
index 7ae38f5b..5f5cfc1a 100755
--- a/app/views/crm/dining_queues/_form.html.erb
+++ b/app/views/crm/dining_queues/_form.html.erb
@@ -1,23 +1,51 @@
+<div class="row">
+  <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">
+         <div class="form-inputs">
+            <%= f.input :queue_no , :class => "dining",:id => "dining", :readonly => true%>
+            <%= f.input :name %>
+            <%= f.input :contact_no %>
+            <%= f.input :seater %>
+            <%= f.input :remark %>
+            
 
-<%= simple_form_for([:crm,@dining_queue]) do |f| %>
-  <%= f.error_notification %>
-  <p class="hidden generate_no"><%= @queue_no  %></p>
-  <div class="col-md-6">
-     <div class="form-inputs">
-        <%= f.input :queue_no , :class => "dining",:id => "dining", :readonly => true%>
-        <%= f.input :name %>
-        <%= f.input :contact_no %>
-        <%= f.input :seater %>
-        <%= f.input :remark %>
-        
-
-      </div>
-      <br>
-      <div class="form-actions">
-        <%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue"%>
+          </div>
+          <br>
+          <div class="form-actions">
+            <%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue"%>
+          </div>
       </div>
+    <% end %>
   </div>
-<% end %>
+
+  <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">
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index baf945bc..0e7eecc7 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.write_txt") %> <%= t("views.right_panel.detail.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        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>
diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb
index 71df5f29..484f806c 100755
--- a/app/views/print_settings/index.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        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>
diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb
index 4304a64f..9fe0ec32 100755
--- a/app/views/print_settings/show.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.print_settings_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+        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>
diff --git a/app/views/settings/accounts/_form.html.erb b/app/views/settings/accounts/_form.html.erb
index b860bf48..0c18ebe2 100755
--- a/app/views/settings/accounts/_form.html.erb
+++ b/app/views/settings/accounts/_form.html.erb
@@ -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
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <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.write_txt") %> <%= t("views.right_panel.detail.title_txt") %> <br>
+        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>
diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb
index dc751a17..4b355d3c 100755
--- a/app/views/settings/accounts/index.html.erb
+++ b/app/views/settings/accounts/index.html.erb
@@ -23,8 +23,7 @@
             <th>Point</th>
             <th>Bonus</th>
             <th>Rebate</th>
-
-            <th style="">Action</th>
+            <th style="">Actions</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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        <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.discount") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= 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.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>
diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb
index 1f3853d4..bd88066f 100755
--- a/app/views/settings/accounts/show.html.erb
+++ b/app/views/settings/accounts/show.html.erb
@@ -11,43 +11,74 @@
 </div>
 
 <br/>
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Account</h4>
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Title</th>
-          <th>Account type</th>
-          <!-- <th>Can get Discount</th> -->
-          <th>Can get Points</th>
-          <!-- <th>Can get Bonus</th> -->
-          <th>Can rebate</th>
-          <th>Action</th>
-        </tr>
-      </thead>
 
-      <tbody>
-        <tr>
-          <td><%= @settings_account.title %></td>
-          <td><%= @settings_account.account_type %></td>
-          <!-- <td><%= @settings_account.discount %></td> -->
-          <td><%= @settings_account.point %></td>
-          <!-- <td><%= @settings_account.bonus %></td> -->
-          <td><%= @settings_account.rebate %></td>
+<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">
+          <thead>
+            <tr>
+              <th>Title</th>
+              <th>Account type</th>
+              <!-- <th>Can get Discount</th> -->
+              <th>Can get Points</th>
+              <!-- <th>Can get Bonus</th> -->
+              <th>Can rebate</th>
+              <th>Actions</th>
+            </tr>
+          </thead>
 
-          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
-            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-            </button>
+          <tbody>
+            <tr>
+              <td><%= @settings_account.title %></td>
+              <td><%= @settings_account.account_type %></td>
+              <!-- <td><%= @settings_account.discount %></td> -->
+              <td><%= @settings_account.point %></td>
+              <!-- <td><%= @settings_account.bonus %></td> -->
+              <td><%= @settings_account.rebate %></td>
 
-            <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>
-      </tbody>
-    </table>
+              <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
+                <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" 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>
+          </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>
+
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 513934d4..c573db20 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.write_txt") %> <%= 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.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>
diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb
index 139d0978..fb7012a6 100755
--- a/app/views/settings/cashier_terminals/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.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>
diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb
index 62e02b43..05ed17df 100755
--- a/app/views/settings/cashier_terminals/show.html.erb
+++ b/app/views/settings/cashier_terminals/show.html.erb
@@ -10,86 +10,124 @@
 </div>
 <br>
 
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Cashier Terminal</h4>
-    <table class="table">
-      <tr>
-        <td><strong>Name:</strong></td>
-        <td><%= @settings_cashier_terminal.name %><td>
-      </tr>
+<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">
+          <tr>
+            <td><strong>Name:</strong></td>
+            <td><%= @settings_cashier_terminal.name %><td>
+          </tr>
 
-      <tr>
-        <td><strong>Is active:</strong></td>
-        <td><%= @settings_cashier_terminal.is_active %></td>
-      </tr>
+          <tr>
+            <td><strong>Is active:</strong></td>
+            <td><%= @settings_cashier_terminal.is_active %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Is currently login:</strong></td>
-        <td><%= @settings_cashier_terminal.is_currently_login %></td>
-      </tr>
+          <tr>
+            <td><strong>Is currently login:</strong></td>
+            <td><%= @settings_cashier_terminal.is_currently_login %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Auto print receipt:</strong></td>
-        <td>
-        <%= @settings_cashier_terminal.auto_print_receipt %>
-        </td>
-      </tr>
+          <tr>
+            <td><strong>Auto print receipt:</strong></td>
+            <td>
+            <%= @settings_cashier_terminal.auto_print_receipt %>
+            </td>
+          </tr>
 
-      <tr>
-        <td><strong>Printer name:</strong></td>
-        <td><%= @settings_cashier_terminal.printer_name %></td>
-      </tr>
+          <tr>
+            <td><strong>Printer name:</strong></td>
+            <td><%= @settings_cashier_terminal.printer_name %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Header:</strong></td>
-        <td><%= @settings_cashier_terminal.header %></td>
-      </tr>
+          <tr>
+            <td><strong>Header:</strong></td>
+            <td><%= @settings_cashier_terminal.header %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Footer:</strong></td>
-        <td><%= @settings_cashier_terminal.footer %></td>
-      </tr>
+          <tr>
+            <td><strong>Footer:</strong></td>
+            <td><%= @settings_cashier_terminal.footer %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Font:</strong></td>
-        <td><%= @settings_cashier_terminal.font %></td>
-      </tr>
+          <tr>
+            <td><strong>Font:</strong></td>
+            <td><%= @settings_cashier_terminal.font %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Font size:</strong></td>
-        <td><%= @settings_cashier_terminal.font_size %></td>
-      </tr>
+          <tr>
+            <td><strong>Font size:</strong></td>
+            <td><%= @settings_cashier_terminal.font_size %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Show tax:</strong></td>
-        <td><%= @settings_cashier_terminal.show_tax %></td>
-      </tr>
+          <tr>
+            <td><strong>Show tax:</strong></td>
+            <td><%= @settings_cashier_terminal.show_tax %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Show cashier:</strong></td>
-        <td><%= @settings_cashier_terminal.show_cashier %></td>
-      </tr>
+          <tr>
+            <td><strong>Show cashier:</strong></td>
+            <td><%= @settings_cashier_terminal.show_cashier %></td>
+          </tr>
 
-      <tr>
-        <td><strong>Show guest info:</strong></td>
-        <td><%= @settings_cashier_terminal.show_guest_info %></td>
-      </tr>
+          <tr>
+            <td><strong>Show guest info:</strong></td>
+            <td><%= @settings_cashier_terminal.show_guest_info %></td>
+          </tr>
 
-      <tr>
-        <td colspan="2" align="right">
-          <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
+          <tr>
+            <td colspan="2" align="right">
+              <%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
 
-          <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(@settings_cashier_terminal) %>" data-method="delete">
-            <%= t("views.btn.delete") %>
-          </button>
+              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(@settings_cashier_terminal) %>" data-method="delete">
+                <%= t("views.btn.delete") %>
+              </button>
 
-          <span class="hidden" id="delete_text">
-              <h6>Are you sure you want to delete this row ?</h6>
-              <h6>This action can't be undo. </h6> 
-          </span>
-        </td>
-      </tr>
-    </table>
+              <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>
+        </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>
+
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index 4ff75432..35327573 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.write_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        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>
diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb
index 3304a2ab..2221be0f 100755
--- a/app/views/settings/commissioners/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.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>
diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb
index 8c9348b2..122f65ea 100755
--- a/app/views/settings/commissioners/show.html.erb
+++ b/app/views/settings/commissioners/show.html.erb
@@ -20,86 +20,130 @@
 </ul>
 <!-- Nav tabs - End -->
 
-<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">
-      <div class="card-block">
-        <table class="table">
-          <tbody>
-          <tr>
-            <td style="width:20%">Name</td>
-            <td><%= @commissioner.name %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Employee Name</td>
-            <td><%= @commissioner.employee.name rescue '-' %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Commission Type</td>
-            <td><%= @commissioner.commission.menu_item.name rescue '-' %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Joined Date</td>
-            <td><%= @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Resigned Date</td>
-            <td><%= @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Active</td>
-            <td><%= @commissioner.is_active %></td>
-          </tr>
-          <tr>
-            <td style="width:20%">Created By</td>
-            <td><%= Employee.find(@commissioner.created_by).name %></td>
-          </tr>
-          <tr>
-            <td colspan="2" align="right">
-              <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(@commissioner),:class => 'btn btn-primary btn-sm waves-effect' %>
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_commissioner_path(@commissioner)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
+<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">
+          <div class="card-block">
+            <table class="table">
+              <tbody>
+              <tr>
+                <td style="width:20%">Name</td>
+                <td><%= @commissioner.name %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Employee Name</td>
+                <td><%= @commissioner.employee.name rescue '-' %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Commission Type</td>
+                <td><%= @commissioner.commission.menu_item.name rescue '-' %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Joined Date</td>
+                <td><%= @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Resigned Date</td>
+                <td><%= @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Active</td>
+                <td><%= @commissioner.is_active %></td>
+              </tr>
+              <tr>
+                <td style="width:20%">Created By</td>
+                <td><%= Employee.find(@commissioner.created_by).name %></td>
+              </tr>
+              <tr>
+                <td colspan="2" align="right">
+                  <%= link_to t("views.btn.edit"), edit_settings_commissioner_path(@commissioner),:class => 'btn btn-primary btn-sm waves-effect' %>
+                  <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_commissioner_path(@commissioner)%>" 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>
-          </tbody>
-        </table>
-       
+                  <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>
+              </tbody>
+            </table>
+           
+          </div>
+        </div>
       </div>
-    </div>
-  </div>
-  <!--- Panel 1 - Transaction -->
-  <div class="tab-pane" id="transaction" role="tabpanel" style="max-height:670px; overflow:auto">
-    <div class="card">
-      <div class="card-block">
+      <!--- Panel 1 - Transaction -->
+      <div class="tab-pane" id="transaction" role="tabpanel" style="max-height:670px; overflow:auto">
+        <div class="card">
+          <div class="card-block">
 
-        <table class="table" id="myTable">
-          <thead>
-          <tr>
-            <th><%= 'Product Type' %></th>
-            <th><%= 'Product Name' %></th>
-            <th><%= 'Qty' %></th>
-            <th><%= 'Price' %></th>
-            <th><%= 'Amount' %></th>
-            <th><%= 'Date' %></th>
-          </tr>
-          </thead>
-          <tbody>
+            <table class="table" id="myTable">
+              <thead>
+              <tr>
+                <th><%= 'Product Type' %></th>
+                <th><%= 'Product Name' %></th>
+                <th><%= 'Qty' %></th>
+                <th><%= 'Price' %></th>
+                <th><%= 'Amount' %></th>
+                <th><%= 'Date' %></th>
+              </tr>
+              </thead>
+              <tbody>
 
-          </tbody>
-        </table>
+              </tbody>
+            </table>
+          </div>
+        </div>
       </div>
+
+      <br/>
+
     </div>
   </div>
 
-  <br/>
+  <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">
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index 8cc04475..ff328ae5 100755
--- a/app/views/settings/commissions/_form.html.erb
+++ b/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
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <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.select_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+      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>
diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb
index 47b9af57..d3d1cfff 100755
--- a/app/views/settings/commissions/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.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>
+        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>
diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb
index f385890c..dba98e75 100755
--- a/app/views/settings/commissions/show.html.erb
+++ b/app/views/settings/commissions/show.html.erb
@@ -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
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <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.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>
+      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>
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 0f8fd345..e31d0a43 100755
--- a/app/views/settings/employees/_form.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          <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.write_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          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>
diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb
index 9f32529d..dd95daf7 100755
--- a/app/views/settings/employees/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.employee_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.employee_txt") %> <br>
+        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>
diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb
index 35d3dac4..5a2d4425 100755
--- a/app/views/settings/employees/show.html.erb
+++ b/app/views/settings/employees/show.html.erb
@@ -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
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <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.employee_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br> 
+      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>
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index 7977f524..ba216830 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.payment_method") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.payment_method_txt") %> <br>
+        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>
diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb
index 0d1b0cf9..a793c676 100755
--- a/app/views/settings/payment_method_settings/index.html.erb
+++ b/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
-          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-          quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          <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.payment_method") %> - <%= t("views.right_panel.detail.payment_method_txt") %> <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.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>
diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb
index 332c5f56..b3798086 100755
--- a/app/views/settings/payment_method_settings/show.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.payment_method") %> - <%= t("views.right_panel.detail.payment_method_txt") %> <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.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>
diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index ae1e0842..e39cf896 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.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>
+        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>
diff --git a/app/views/settings/products/index.html.erb b/app/views/settings/products/index.html.erb
index 1e12d833..a5d91b11 100755
--- a/app/views/settings/products/index.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+          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>
diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb
index 6df56593..cd5639ea 100755
--- a/app/views/settings/products/show.html.erb
+++ b/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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        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>
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index c0c05145..f22aaaf7 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -200,10 +200,37 @@
  <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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.promotion_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.promotion_code_txt") %> <br>
+        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>
diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
index 699240bc..02d7b5ad 100755
--- a/app/views/settings/promotions/index.html.erb
+++ b/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) %>
-              <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><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-info btn-sm waves-effect' %>
             </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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.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>
+        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>
diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb
index 77489879..f09d59e0 100755
--- a/app/views/settings/promotions/show.html.erb
+++ b/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>
-
-
+          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-"  %></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
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <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.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>
+      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>
diff --git a/app/views/settings/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb
index 739a0e37..f578aa74 100755
--- a/app/views/settings/rooms/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.room_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.room_txt") %> <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.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>
diff --git a/app/views/settings/rooms/show.html.erb b/app/views/settings/rooms/show.html.erb
index 9453a699..30ef0625 100755
--- a/app/views/settings/rooms/show.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.room_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.room_txt") %><br> 
+        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>
diff --git a/app/views/settings/tables/index.html.erb b/app/views/settings/tables/index.html.erb
index 45b7a450..87c394fd 100755
--- a/app/views/settings/tables/index.html.erb
+++ b/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>
-        2) Is active - checkbox for is active or not <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) <%= 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>
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index 5a490d13..79f27c9a 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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.write_txt") %> <%= 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.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>
diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb
index de3ab94e..b679860e 100755
--- a/app/views/settings/tax_profiles/index.html.erb
+++ b/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
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <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>
+        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>
diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb
index d0808a49..02a12256 100755
--- a/app/views/settings/tax_profiles/show.html.erb
+++ b/app/views/settings/tax_profiles/show.html.erb
@@ -9,48 +9,78 @@
   </ol>
 </div>
 
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Tax Profiles</h4>
-    <table class="table">
-    <tr>
-      <td><strong>Name:</strong></td>
-      <td><%= @settings_tax_profile.name %></td>
-    </tr>
+<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">
+        <tr>
+          <td><strong>Name:</strong></td>
+          <td><%= @settings_tax_profile.name %></td>
+        </tr>
 
-    <tr>
-      <td><strong>Rate:</strong></td>
-      <td><%= @settings_tax_profile.rate %></td>
-    </tr>
+        <tr>
+          <td><strong>Rate:</strong></td>
+          <td><%= @settings_tax_profile.rate %></td>
+        </tr>
 
-    <tr>
-      <td><strong>Inclusive:</strong></td>
-      <td><%= @settings_tax_profile.inclusive %></td>
-    </tr>
+        <tr>
+          <td><strong>Inclusive:</strong></td>
+          <td><%= @settings_tax_profile.inclusive %></td>
+        </tr>
 
-    <tr>
-      <td><strong>Order by:</strong></td>
-      <td><%= @settings_tax_profile.order_by %></td>
-    </tr>
+        <tr>
+          <td><strong>Order by:</strong></td>
+          <td><%= @settings_tax_profile.order_by %></td>
+        </tr>
 
-    <tr>
-      <td><strong>Created by:</strong></td>
-      <td><%= @settings_tax_profile.created_by %></td>
-    </tr>
+        <tr>
+          <td><strong>Created by:</strong></td>
+          <td><%= @settings_tax_profile.created_by %></td>
+        </tr>
 
-    <tr>
-    <td colspan="2" align="right">
-    <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(@settings_tax_profile),:class => "btn btn-info ben-sm waves-effer" %>
-  <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_tax_profile_path(@settings_tax_profile)%>" data-method="delete">
-        <%= t("views.btn.delete") %>
-      </button>
+        <tr>
+        <td colspan="2" align="right">
+        <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(@settings_tax_profile),:class => "btn btn-info ben-sm waves-effer" %>
+      <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_tax_profile_path(@settings_tax_profile)%>" 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>
-  </table>
+          <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>
+      </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>
+
diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb
index 63b2deeb..a75c501a 100755
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -50,10 +50,10 @@
       <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.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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43744abe..87d346f4 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -136,6 +136,8 @@ en:
         pick_image: "PICK IMAGE"
         cancel: "CANCEL"
         assign_processing_items: "ASSIGN PROCESSING ITEMS"
+        add_product: "ADD PRODUCT"
+        queue: "QUEUE"
       detail:
         name: "Name"
         type: "Type"
@@ -146,6 +148,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"
@@ -195,6 +198,66 @@ en:
         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"
@@ -221,6 +284,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"
@@ -235,6 +299,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"
@@ -272,7 +337,75 @@ en:
         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 "
 
@@ -280,7 +413,7 @@ en:
         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 "