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

app/controllers/origami/addorders_controller.rb

@@ -1,6 +1,6 @@
 class Origami::AddordersController < BaseOrigamiController
   # before_action :set_dining, only: [:detail]
-
+  
   def index
       @tables = Table.all.active.order('zone_id asc').group("zone_id")
       @rooms = Room.all.active.order('zone_id asc').group("zone_id")

app/controllers/origami/quick_service_controller.rb

@@ -1,6 +1,12 @@
 class Origami::QuickServiceController < ApplicationController
   # before_action :set_dining, only: [:detail]
-
+   before_action :check_user
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
   def index
     today = DateTime.now
     day = Date.today.wday
@@ -211,6 +217,11 @@ class Origami::QuickServiceController < ApplicationController
     end
   end
 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
   # this can always true
   def check_order_with_booking(booking)
     if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"

app/controllers/origami/request_bills_controller.rb

@@ -1,5 +1,11 @@
 class Origami::RequestBillsController < ApplicationController
-
+  before_action :check_user
+ 
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
   # Print Request Bill and add to sale tables
   def print
     @sale = Sale.new

app/controllers/reports/saleitem_controller.rb

@@ -15,8 +15,10 @@ class Reports::SaleitemController < BaseReportController
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
       end
     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)
-
+    @type = params[:sale_type]
+    @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,@type)
+puts @other_charges.to_json
+puts "oooooooooooooooooooooooo"
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
 
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}