modify api and change rounding adj
This commit is contained in:
@@ -2,7 +2,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
|
||||
# skip_before_action :authenticate
|
||||
ORDER = "order"
|
||||
RESERVATION = "reservation"
|
||||
ORDER_RESERVATION = "order and reservation"
|
||||
ORDER_RESERVATION = "order_and_reservation"
|
||||
|
||||
def check_customer
|
||||
customer_id = 0
|
||||
@@ -42,6 +42,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
|
||||
else
|
||||
status = true
|
||||
end
|
||||
elsif !params[:callback_url]
|
||||
render :json => { :status => false, :message => "callback_url is required!" }
|
||||
end
|
||||
|
||||
if status == true
|
||||
|
||||
@@ -71,8 +71,10 @@ class Origami::MovetableController < BaseOrigamiController
|
||||
|
||||
booking.booking_orders.each do |booking_order|
|
||||
order = Order.find(booking_order.order_id)
|
||||
order.order_items.each do |order_item|
|
||||
order_items.push(order_item)
|
||||
if order.status == 'new'
|
||||
order.order_items.each do |order_item|
|
||||
order_items.push(order_item)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user