Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill

app/views/layouts/_left_sidebar.html.erb

@@ -70,12 +70,12 @@
 				</ul>
 			</li>
 			<% if can? :menage, Inventory %>
-			<!-- <li>
+			<li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
-			</li> -->
+			</li>
 			<%end%>
 			<li class="header"><%= t :backend %></li>
 			<li>

db/migrate/20180213050551_add_image_path_to_employees.rb

@@ -0,0 +1,9 @@
+class AddImagePathToEmployees < ActiveRecord::Migration[5.1]
+  def change
+    add_column :employees, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end

db/migrate/20180213050631_add_image_path_to_customers.rb

@@ -0,0 +1,9 @@
+class AddImagePathToCustomers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :customers, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end

db/migrate/20180213052206_add_image_path_to_commissioners.rb

@@ -0,0 +1,9 @@
+class AddImagePathToCommissioners < ActiveRecord::Migration[5.1]
+  def change
+    add_column :commissioners, :image_path, :string
+  end
+
+  def down
+  	remove_column :image_path
+  end
+end

db/migrate/20180213053009_create_display_images.rb

@@ -0,0 +1,14 @@
+class CreateDisplayImages < ActiveRecord::Migration[5.1]
+  def change
+    create_table :display_images do |t|
+      t.integer :shop_id
+      t.binary :image
+      t.string :created_by
+      t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :display_images
+  end
+end