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

add survey update function

Browse Source
This commit is contained in:
phyusin
2018-02-19 10:23:15 +06:30
parent 032e085b6e
commit 9594689f1c
2 changed files with 78 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
class Origami::SurveysController < BaseOrigamiController
def new
@id = params[:id]
@survey = Survey.new()
@id = params[:id]
if(@id[0,3] == "SAL")
@sale = Sale.find(@id)
@@ -9,14 +10,17 @@ class Origami::SurveysController < BaseOrigamiController
@booking = Booking.find_by_sale_id(@id)
@dining_facility = DiningFacility.find(@booking.dining_facility_id)
@table_type = @dining_facility.type
@survey = Survey.new()
# @survey = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name, @receipt_no)
@survey_data = Survey.find_by_dining_name(@dining_facility.name)
survey_process = Survey.find_by_receipt_no(@receipt_no)
if !survey_process.nil?
@survey_data = survey_process
end
else
@dining_facility = DiningFacility.find(@id)
@table_type = @dining_facility.type
@receipt_no = nil
@grand_total = nil
@survey = Survey.find_by_dining_name(@dining_facility.name)
@survey_data = Survey.find_by_dining_name(@dining_facility.name)
end
end
@@ -25,8 +29,8 @@ class Origami::SurveysController < BaseOrigamiController
@url = "/origami/"+@dining_facility.type.downcase+"/"+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)
if request.post?
if params[:survey_id].nil? || params[:survey_id] == ""
@survey = Survey.new(survey_params)
@survey.shift_id = shift_by_terminal.id
@survey.foreigner = params["survey"]["foreigner"].to_json
@@ -61,7 +65,7 @@ class Origami::SurveysController < BaseOrigamiController
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)
survey = Survey.find_by_receipt_no(params[:receipt_no])
survey = Survey.find_by_dining_name(dining_facility.name)
if survey.nil?
survey = Survey.new
@@ -73,6 +77,7 @@ class Origami::SurveysController < BaseOrigamiController
survey.total_amount = params[:total_amount]
survey.save!
else
survey.receipt_no = params[:receipt_no]
survey.total_customer = params[:total_customer]
survey.save!
end