git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

order reservation null issue checked

Browse Source
This commit is contained in:
Aung Kyaw Phyoe
2019-01-14 13:48:13 +06:30
parent 0d60e97014
commit 7ad4a38398
2 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -69,7 +69,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
order_reservation = params order_reservation = params
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
if flag if !order_reservation_id.nil? && flag
shop = Shop.find_by_id(1) shop = Shop.find_by_id(1)
if !shop.nil? if !shop.nil?
shop_code = shop.shop_code shop_code = shop.shop_code
@@ -90,6 +90,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
from = "" from = ""
end end
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code,from:from,audio:audio ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code,from:from,audio:audio
elsif order_reservation_id.nil? && !flag
result = { :status => false, :message => "Some error occurred!" }
else else
result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" } result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
end end

9
app/models/order_reservation.rb
View File

@@ -53,6 +53,8 @@ class OrderReservation < ApplicationRecord
Rails.logger.debug order_reserve.to_s Rails.logger.debug order_reserve.to_s
check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference]) check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference])
if check_order_reservation.empty? if check_order_reservation.empty?
OrderReservation.transaction do
begin
order_reservation = OrderReservation.new order_reservation = OrderReservation.new
order_reservation.order_reservation_type = order_reserve[:order_type] order_reservation.order_reservation_type = order_reserve[:order_type]
order_reservation.customer_id = order_reserve[:cus_info] order_reservation.customer_id = order_reserve[:cus_info]
@@ -91,7 +93,14 @@ class OrderReservation < ApplicationRecord
if order_reserve[:delivery_info] if order_reserve[:delivery_info]
Delivery.addDeliveryInfo(order_reserve[:delivery_info],order_reservation.id) Delivery.addDeliveryInfo(order_reserve[:delivery_info],order_reservation.id)
end end
return order_reservation.id, true return order_reservation.id, true
rescue ActiveRecord::StatementInvalid
raise ActiveRecord::Rollback
return nil, false
end
end
else else
return check_order_reservation[0].id, false return check_order_reservation[0].id, false
end end