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

2018-06-27 10:29:39 +06:30
parent 95f4125b53 86916fb7e7
commit d763f9212a
12 changed files with 93 additions and 45 deletions
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -129,7 +129,7 @@ class Origami::RoomsController < BaseOrigamiController
    accounts = TaxProfile.where("group_type = ?","cashier").order("order_by ASC")
    @tax_arr =[]
    accounts.each do |acc|
-      @tax_arr.push(account.name)
+      @tax_arr.push(acc.name)
    end

    lookup_spit_bill = Lookup.collection_of('split_bill')