fixed conflit

app/views/api/orders/create.json.jbuilder

@@ -5,11 +5,12 @@ if @status == true
   json.order_items do
     json.array! @order.order_items, :item_code, :item_name, :qty, :options, :remark,:price
   end
+  json.sale_id @sale.sale_id
 else
   json.status :error
   if @error_messages
     json.error_messages @error_messages
   else
-    json.error_messages @order.errors
+    json.error_messages @message
   end
 end

app/views/api/orders/view_orders.json.jbuilder

@@ -20,7 +20,7 @@ if (@booking)
   @total_tax = 0.00
 
   # For YGN BBQ
-  adult_count = 0    
+  adult_count = 0
   child_count = 0
   adult_spent = 0
   child_spent = 0
@@ -33,18 +33,18 @@ if (@booking)
       if (order.status == "new")
         order_items = order_items + order.order_items
       end
-    end    
+    end
 
     json.order_items order_items do |item|
       total_set_menu = 0
       # For YGN BBQ
       if item.item_code.include? ("PSA_")
-        adult_count += item.qty 
-        adult_spent += (item.price * item.qty)       
+        adult_count += item.qty
+        adult_spent += (item.price * item.qty)
       end
       if item.item_code.include? ("PSC_")
         child_count += item.qty
-        child_spent += (item.price * item.qty)  
+        child_spent += (item.price * item.qty)
       end
       # End YGN BBQ
 
@@ -115,7 +115,7 @@ if (@booking)
     end
     @total_tax_amount = @service_charges + @commercial_tax
   end
-  
+
   #total tax calculation
   json.sub_total @total_amount
   if @service_rate.to_i > 0

app/views/api/verifications/new.json.jbuilder

@@ -1,7 +1,11 @@
-if @result && @cus
+if @result 
 	 json.status true
 	 json.sent_pin true
+ elsif @cus 
+ 	json.status true 
+ 	json.sent_pin false
+ 	json.customer_id @cus.id
  else
  	json.status false
- 	json.message "Customer Not Found"
+ 	json.message "Phone number invalid"
  end