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

check menu is_available, survey id and check status with sale items SUM in receipBill

Browse Source
This commit is contained in:
phyusin
2018-05-16 17:08:00 +06:30
parent 486694a5e4
commit fa4c5d075e
8 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -18,7 +18,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end
if status
check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id])
check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal')
if !check_customer.nil?
customer_id = check_customer.customer_id
else

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

@@ -18,8 +18,8 @@ class Api::SurveyController < Api::ApiController
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 params[:survey_id]
survey = Survey.find(params[:survey_id])
if params[:id]
survey = Survey.find(params[:id])
else
survey = Survey.new
end