From 7ce71a1960221b958f5c41a0c5a0b07054b1f615 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 30 Nov 2017 11:19:15 +0630
Subject: [PATCH] update inventory hide and cancan update

---
 .../inventory/inventory_controller.rb         |  2 +-
 .../origami/in_duties_controller.rb           |  1 -
 app/models/ability.rb                         | 23 +++++++++++++++----
 app/views/layouts/_left_sidebar.html.erb      |  6 +++--
 app/views/origami/home/show.html.erb          |  2 ++
 app/views/origami/rooms/show.html.erb         |  1 +
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 673cf943..1a311552 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,5 +1,5 @@
 class Inventory::InventoryController < BaseInventoryController
-
+   load_and_authorize_resource
    def index
      @products = InventoryDefinition.all.active.order('created_at desc') 
    end
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index 2c30bbd9..5607939a 100755
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -1,6 +1,5 @@
 class Origami::InDutiesController < BaseOrigamiController
   before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
-
   # GET /in_duties
   # GET /in_duties.json
   def index
diff --git a/app/models/ability.rb b/app/models/ability.rb
index c2947fe1..50f37fbc 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -25,11 +25,6 @@ class Ability
         can :manage, TaxProfile
         can :manage, PrintSetting
         can :manage, Account
-        can :manage, Commission
-        can :manage, Commissioner
-        can :manage, Promotion
-        can :manage, Product
-
 
         can :manage, Order
         can :manage, Booking
@@ -79,6 +74,13 @@ class Ability
 
         can :overall_void, :void
 
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
+
+        can :manage, Inventory
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
@@ -112,6 +114,11 @@ class Ability
         can :move_dining, :moveroom
 
         can :manage, DiningQueue
+
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
                                                
     elsif user.role == "account"
 
@@ -148,6 +155,12 @@ class Ability
         can :show, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
+
     end
   end
 end
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 1ec77487..80ea2fb1 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -65,12 +65,14 @@
 				</ul>
 			</li>
 			<% end %>
-			<li>
+			<% if can? :menage, Inventory %>
+			<!-- <li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
-			</li>
+			</li> -->
+			<%end%>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index d18e0c8f..c0845822 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -377,8 +377,10 @@
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+                  
                   <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 5e461650..54d8f5f3 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -348,6 +348,7 @@
         <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
         <button type="button" id="discount" class="btn bg-blue btn-block" >Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
+        
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->