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

2017-12-05 18:19:57 +06:30
parent c45d107008 f4a7e1baa0
commit 93a735c55e
3 changed files with 11 additions and 10 deletions
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -18,7 +18,7 @@ class Reports::SaleitemController < BaseReportController
    @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
+puts @sale_data.to_json
    @account_cate_count = Hash.new {|hash, key| hash[key] = 0}