shop code
This commit is contained in:
@@ -4,7 +4,6 @@ class Origami::OrderReservationController < BaseOrigamiController
|
||||
@order = OrderReservation.latest_order #.active
|
||||
@count_on_order = OrderReservation.get_count_on_order
|
||||
@count_on_completed = OrderReservation.get_count_on_completed
|
||||
@shop = Shop.find_by_id(1)
|
||||
@receipt_bill = check_receipt_bill
|
||||
end
|
||||
|
||||
@@ -23,7 +22,7 @@ class Origami::OrderReservationController < BaseOrigamiController
|
||||
|
||||
order_reserve = OrderReservation.find_by_transaction_ref(params[:ref_no])
|
||||
if !order_reserve.nil?
|
||||
if !ShiftSale.current_shift.nil?
|
||||
if !ShiftSale.current_shift(@shop.shop_code).nil?
|
||||
if @status == "processed"
|
||||
if order_reserve.status == "accepted"
|
||||
result = OrderReservation.create_doemal_order(order_reserve,current_user)
|
||||
@@ -87,7 +86,7 @@ class Origami::OrderReservationController < BaseOrigamiController
|
||||
def send_status
|
||||
order_reservation = OrderReservation.find_by_transaction_ref(params[:ref_no])
|
||||
if !order_reservation.nil?
|
||||
if !ShiftSale.current_shift.nil? || params[:status] == 'accepted' || (order_reservation.status == 'new' && params[:status] == 'rejected')
|
||||
if !ShiftSale.current_shift(@shop.shop_code).nil? || params[:status] == 'accepted' || (order_reservation.status == 'new' && params[:status] == 'rejected')
|
||||
response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],params[:status],params[:waiting_time],params[:min_type],params[:reason])
|
||||
else
|
||||
response = { status: false, message: 'No current shift open for this employee!'}
|
||||
@@ -99,12 +98,12 @@ class Origami::OrderReservationController < BaseOrigamiController
|
||||
end
|
||||
|
||||
def get_order_info
|
||||
order_reservation = OrderReservation.where("status = 'new'").count()
|
||||
order_reservation = OrderReservation.where("status = 'new' and shop_code='#{@shop.shop_code}'").count()
|
||||
render :json => order_reservation
|
||||
end
|
||||
|
||||
def check_receipt_bill
|
||||
receipt_bill = Lookup.collection_of("order_reservation")
|
||||
receipt_bill = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of("order_reservation")
|
||||
|
||||
status = 0
|
||||
if !receipt_bill.nil?
|
||||
|
||||
Reference in New Issue
Block a user