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-21 14:30:27 +06:30
parent 8258349b5e 6ed3cb64e8
commit e39a820b4d
3 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/order_reservation.js
View File

@@ -446,7 +446,7 @@ function callback_url(callback,ref_no,order_id,status,min_type,time,exptime,reas
$.ajax({
type: "POST",
url: url,
data: {order_id: order_id, status: status, min_type: min_type, expected_time: waiting_time, remark: reason, access_code: access_code},
data: {order_id: order_id, ref_no: ref_no, status: status, min_type: min_type, expected_time: waiting_time, remark: reason, access_code: access_code},
dataType: "json",
success: function(data) {
if (data.status) {

9
app/controllers/origami/order_reservation_controller.rb
View File

@@ -20,6 +20,9 @@ class Origami::OrderReservationController < BaseOrigamiController
access_code = params[:access_code]
@order_reservation = OrderReservation.find(@id)
order_reserve = OrderReservation.find_by_transaction_ref(params[:ref_no])
if !order_reserve.nil?
if !ShiftSale.current_shift.nil?
if @status == "processed"
result = OrderReservation.create_doemal_order(@order_reservation,current_user)
elsif @status == "delivery"
@@ -38,6 +41,12 @@ class Origami::OrderReservationController < BaseOrigamiController
response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"accepted")
result = {:status=> true, :message => "accepted" }
end
end
else
result = { status: false, message: 'No current shift open for this employee!'}
end
else
result = { status: false, message: 'There is no order for '+params[:ref_no]+'!'}
end
render :json => result.to_json
end