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({ $.ajax({
type: "POST", type: "POST",
url: url, 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", dataType: "json",
success: function(data) { success: function(data) {
if (data.status) { if (data.status) {

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

@@ -20,25 +20,34 @@ class Origami::OrderReservationController < BaseOrigamiController
access_code = params[:access_code] access_code = params[:access_code]
@order_reservation = OrderReservation.find(@id) @order_reservation = OrderReservation.find(@id)
if @status == "processed" order_reserve = OrderReservation.find_by_transaction_ref(params[:ref_no])
result = OrderReservation.create_doemal_order(@order_reservation,current_user) if !order_reserve.nil?
elsif @status == "delivery" if !ShiftSale.current_shift.nil?
OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery") if @status == "processed"
response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery") result = OrderReservation.create_doemal_order(@order_reservation,current_user)
result = {:status=> true, :message => "ready for delivery" } elsif @status == "delivery"
elsif @status == "completed" OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery")
result = OrderReservation.update_doemal_payment(@order_reservation,current_user) response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery")
result = {:status=> true, :message => "ready for delivery" }
elsif @status == "completed"
result = OrderReservation.update_doemal_payment(@order_reservation,current_user)
else
if @status == "rejected"
OrderReservation.update_order_reservation(@id, nil, "rejected",nil,remark,access_code,current_user)
response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"rejected")
result = {:status=> true, :message => "rejected" }
else
OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time)
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 else
if @status == "rejected" result = { status: false, message: 'There is no order for '+params[:ref_no]+'!'}
OrderReservation.update_order_reservation(@id, nil, "rejected",nil,remark,access_code,current_user) end
response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"rejected")
result = {:status=> true, :message => "rejected" }
else
OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time)
response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"accepted")
result = {:status=> true, :message => "accepted" }
end
end
render :json => result.to_json render :json => result.to_json
end end

54
app/models/sale.rb
View File

@@ -164,37 +164,37 @@ class Sale < ApplicationRecord
#fOR Quick Service pay and create #fOR Quick Service pay and create
def self.request_bill(order,current_user,current_login_employee) def self.request_bill(order,current_user,current_login_employee)
@sale = Sale.new @sale = Sale.new
sale_order=SaleOrder.new sale_order=SaleOrder.new
if !ShiftSale.current_shift.nil? if !ShiftSale.current_shift.nil?
order_id = order.order_id # order_id order_id = order.order_id # order_id
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id)
if check_booking.sale_id.nil? if check_booking.sale_id.nil?
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
# puts "current_login_employee" # puts "current_login_employee"
# puts current_login_employee.name # puts current_login_employee.name
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user,order.source) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user,order.source)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else
@sale_data = Sale.find_by_sale_id(check_booking.sale_id) @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
end end
# Bind shift sale id to sale # Bind shift sale id to sale
# @sale_data.shift_sale_id = shift.id # @sale_data.shift_sale_id = shift.id
# @sale_data.save # @sale_data.save
# Promotion Activation # Promotion Activation
Promotion.promo_activate(@sale) Promotion.promo_activate(@sale)
@status = true @status = true
return @status, @sale return @status, @sale
else else
@status = false @status = false
@message = "No Current Open Shift for This Employee" @message = "No Current Open Shift for This Employee"
end end
end end
#This is when spilt bill is request - then we cannot link order to invoice #This is when spilt bill is request - then we cannot link order to invoice
#Cos there will be multiple orders - and items are spilt from there. #Cos there will be multiple orders - and items are spilt from there.