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

app/controllers/api/call_waiters_controller.rb

@@ -0,0 +1,12 @@
+class Api::CallWaitersController < ActionController::API
+
+  #List all active customers by name
+  def index
+    @table_id = params[:dining_id]
+    @time     = params[:time]
+    @table    = DiningFacility.find(@table_id)
+    CallWaiterJob.perform_later(@table,@time)
+  end
+
+  
+end

app/controllers/reports/receipt_no_controller.rb

@@ -22,9 +22,6 @@ authorize_resource :class => false
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
         @tax_profiles = TaxProfile.order('order_by asc')
 
-puts @sale_data.count
-puts "sssssss"
-puts @tax_profiles.to_json
         @from       = from
         @to         = to
 

app/controllers/reports/saleitem_controller.rb

@@ -17,6 +17,8 @@ class Reports::SaleitemController < BaseReportController
     end
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
 
+    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+puts @sale_taxes.to_json
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}