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

app/controllers/home_controller.rb

@@ -120,7 +120,8 @@ class HomeController < ApplicationController
     @inventories    = StockJournal.inventory_balances(today,@from,@to,@from_time,@to_time).sum(:balance)
 
     @total_trans     = Sale.total_trans(today,current_user,@from,@to,@from_time,@to_time)
-    @total_payment_trans    = Sale.total_payment_trans(today,current_user,@from,@to,@from_time,@to_time)
+    @total_card     = Sale.total_card_sale(today,current_user,@from,@to,@from_time,@to_time)
+    @total_credit   = Sale.credit_payment(today,current_user,@from,@to,@from_time,@to_time)
 
     @sale_data = Array.new
     @total_payment_methods = Sale.total_payment_methods(today,current_user,@from,@to,@from_time,@to_time)

app/controllers/origami/home_controller.rb

@@ -102,8 +102,7 @@ class Origami::HomeController < 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)
+      @tax_arr.push(acc.name)
     end
 
     lookup_spit_bill = Lookup.collection_of('split_bill')

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