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

2018-06-26 14:16:40 +06:30
parent 3c9af7233a da1f0a4765
commit 0169a62430
12 changed files with 130 additions and 49 deletions
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -129,7 +129,6 @@ class Origami::RoomsController < BaseOrigamiController
    accounts = TaxProfile.where("group_type = ?","cashier").order("order_by ASC")
    @tax_arr =[]
    accounts.each do |acc|
-      account = TaxProfile.find(acc.id)
      @tax_arr.push(account.name)
    end