Fixed conflict
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
if @order_items
|
||||
json.status true
|
||||
json.order_items @order_items
|
||||
else
|
||||
json.status false
|
||||
json.message "Invalid order_id"
|
||||
end
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
json.status @status
|
||||
json.message @message
|
||||
json.balance_amount @balance
|
||||
json.paid_amount @paid_amount
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
json.status @status
|
||||
json.message @message
|
||||
Reference in New Issue
Block a user