From 42a7d01e166c9e4b7f881a363c81bc64c64aaabe Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 27 Jul 2017 12:08:35 +0630
Subject: [PATCH 1/2] update header view

---
 app/views/layouts/_header.html.erb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 69054218..156c17b0 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -46,10 +46,16 @@
           </ul>
         </li>
         <li class="navbar-nav mr-auto">
-          <a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a></li>
+          <a href="<%= oqs_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;OQS</a>
+        </li>
+        <li class="navbar-nav mr-auto">
+          <a href="<%= origami_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Origami</a>
+        </li>
+        <li class="navbar-nav mr-auto">
+          <a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a>
+        </li>
 
-          <li class="navbar-nav mr-auto">
-          <a href="<%= oqs_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;OQS</a></li>
+          
      </ul>
 
    </div>

From 63cda9a076df2af70c5bf59124c19de533f09992 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 27 Jul 2017 17:43:07 +0630
Subject: [PATCH 2/2] update view files

---
 app/views/layouts/_header.html.erb                 |  2 +-
 app/views/print_settings/index.html.erb            |  7 +++----
 app/views/settings/accounts/index.html.erb         | 14 +++++++-------
 app/views/settings/employees/index.html.erb        |  8 +++++++-
 .../settings/membership_settings/index.html.erb    | 14 +++++++-------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 156c17b0..2a328cc9 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -2,7 +2,7 @@
    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
      <span class="navbar-toggler-icon"></span>
    </button>
-   <a class="navbar-brand" href="#" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
+   <a class="navbar-brand" href="<%= root_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
    <div class="collapse navbar-collapse" id="navbarCollapse">
      <ul class="navbar-nav mr-auto">
         <li class="navbar-nav mr-auto dropdown">
diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb
index e05b1260..9c8ce0b0 100644
--- a/app/views/print_settings/index.html.erb
+++ b/app/views/print_settings/index.html.erb
@@ -29,7 +29,7 @@
         <th>Precision</th>
         <th>Delimiter</th>
         <th>Heading_space</th>
-        <th colspan="3"></th>
+        <th>Action</th>
       </tr>
     </thead>
 
@@ -51,9 +51,8 @@
           <td><%= print_setting.precision %></td>
           <td><%= print_setting.delimiter %></td>
           <td><%= print_setting.heading_space %></td>
-          <td><%= link_to 'Show', print_setting %></td>
-          <td><%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
-          <td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          <td><%= link_to 'Show', print_setting %> | <%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
+          <!-- <td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
         </tr>
       <% end %>
     </tbody>
diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb
index 541bc0a1..09473b97 100644
--- a/app/views/settings/accounts/index.html.erb
+++ b/app/views/settings/accounts/index.html.erb
@@ -16,10 +16,10 @@
       <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>Discount</th>
+        <th>Point</th>
+        <th>Bonus</th>
+        <th>Rebate</th>
 
         <th style="">Action</th>
       </tr>
@@ -29,10 +29,10 @@
       <% @settings_accounts.each do |account| %>
         <tr>
           <td><%= account.title %></td>
-          <td><%= account.account_type %></td>
-          <!-- <td><%= account.discount %></td> -->
+          <td><%=  %><%= account.account_type == 1 ? "Expense" : "Income"%></td>
+          <td><%= account.discount %></td>
           <td><%= account.point %></td>
-          <!-- <td><%= account.bonus %></td> -->
+          <td><%= account.bonus %></td>
           <td><%= account.rebate %></td>
           <td>
             <%= link_to 'Edit', edit_settings_account_path(account) %> |
diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb
index d0d55202..0dbbcfe6 100644
--- a/app/views/settings/employees/index.html.erb
+++ b/app/views/settings/employees/index.html.erb
@@ -25,7 +25,13 @@
           <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
           <td><%= employee.role %></td>
           <td>
-            <%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <%= link_to 'Edit', edit_settings_employee_path(employee) %>  
+           <%if employee.role != "administrator"%>
+             
+           
+           | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %>
+          <%end%>  
+          </td>
         </tr>
       <% end %>
     </tbody>
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb
index e382f026..fa3b22ba 100644
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -16,8 +16,8 @@
         <th>Is active</th>
         <th>Gateway communication type</th>
         <th>Gateway url</th>
-        <th>Auth token</th>
-        <th>Merchant account</th>
+        <!-- <th>Auth token</th>
+        <th>Merchant account</th> -->
         <th>Discount</th>
         <th>Rebate</th>
         <th>Bonus</th>
@@ -29,18 +29,18 @@
     <tbody>
       <% @settings_membership_settings.each do |settings_membership_setting| %>
         <tr>
-          <td><%= link_to settings_membership_setting.membership_type, settings_membership_setting_path(settings_membership_setting) %></td>
+          <td><%= link_to settings_membership_setting.membership_type, edit_settings_membership_setting_path(settings_membership_setting) %></td>
           <td><%= settings_membership_setting.is_active %></td>
           <td><%= settings_membership_setting.gateway_communication_type %></td>
           <td><%= settings_membership_setting.gateway_url %></td>
-          <td><%= settings_membership_setting.auth_token %></td>
-          <td><%= settings_membership_setting.merchant_account rescue ''%></td>
+          <!-- <td><%= settings_membership_setting.auth_token %></td>
+          <td><%= settings_membership_setting.merchant_account rescue ''%></td> -->
           <td><%= settings_membership_setting.discount %></td>
           <td><%= settings_membership_setting.rebate %></td>
           <td><%= settings_membership_setting.bonus %></td>
           <td><%= settings_membership_setting.point %></td>
-          <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td>
-          <td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+         <!--  <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td> -->
+          <!-- <td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
         </tr>
       <% end %>
     </tbody>