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

2017-06-26 18:16:03 +06:30
parent 1000968a8f 089848ed4a
commit f3417a61c0
104 changed files with 2355 additions and 247 deletions
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -1,4 +1,5 @@
 class Transactions::OrdersController < ApplicationController
+	load_and_authorize_resource except: [:create]
 	def index

 		filter = params[:filter]     
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -1,4 +1,5 @@
 class Transactions::SalesController < ApplicationController
+  load_and_authorize_resource except: [:create]
  before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy]

  # GET /transactions/sales