git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-06-19 14:04:46 +06:30
parent 217d3fe88b 5dbf622401
commit e331ebfcde
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/api/survey_controller.rb
View File

@@ -15,9 +15,18 @@ class Api::SurveyController < Api::ApiController
def create
dining_facility = DiningFacility.find(params[:id])
cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
puts params.to_json
# cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
# shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
# puts params.to_json
# set cashier
open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
current_shift = ShiftSale.current_shift
if open_cashier.count>0
shift_by_terminal = ShiftSale.current_open_shift(open_cashier[0].id)
else
shift_by_terminal = ShiftSale.current_open_shift(current_shift.employee_id)
end
if params[:survey][:id]>0
survey = Survey.find(params[:survey][:id])
else

21
app/controllers/origami/surveys_controller.rb
View File

@@ -40,11 +40,24 @@ class Origami::SurveysController < BaseOrigamiController
def create
@type = params[:cashier_type]
@sale_id = params[:sale_id]
if params[:table_id].to_i>0
@dining_facility = DiningFacility.find(params[:table_id])
cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
@dining_facility = DiningFacility.find(params[:table_id])
if params[:sale_id].to_i > 0
# cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id)
# shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
# set cashier
open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
current_shift = ShiftSale.current_shift
if open_cashier.count>0
shift_by_terminal = ShiftSale.current_open_shift(open_cashier[0].id)
else
shift_by_terminal = ShiftSale.current_open_shift(current_shift.employee_id)
end
else
sale = Sale.find(@sale_id)
shift = ShiftSale.find(sale.shift_sale_id)
shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(shift.cashier_terminal_id,nil)
end
else
sale = Sale.find(@sale_id)
shift = ShiftSale.find(sale.shift_sale_id)