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

change params

Browse Source
This commit is contained in:
phyusin
2018-04-23 19:20:03 +06:30
parent 3d39e398df
commit e62ba4d6c2
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end end
if status == true if status == true
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params) order_reservation = params
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
order_reservation = OrderReservation.find(order_reservation_id) order_reservation = OrderReservation.find(order_reservation_id)
# if ENV["SERVER_MODE"] != 'cloud' # if ENV["SERVER_MODE"] != 'cloud'

48
app/models/order_reservation.rb
View File

@@ -12,40 +12,40 @@ class OrderReservation < ApplicationRecord
DELIVERED = "delivered" DELIVERED = "delivered"
COMPLETED = "completed" COMPLETED = "completed"
def self.addOrderReservationInfo(params) def self.addOrderReservationInfo(order_reservation)
check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference]) check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reservation[:reference])
if check_order_reservation.empty? if check_order_reservation.empty?
order_reservation = OrderReservation.new order_reservation = OrderReservation.new
order_reservation.order_reservation_type = params[:order_type] order_reservation.order_reservation_type = order_reservation[:order_type]
order_reservation.customer_id = params[:cus_info] order_reservation.customer_id = order_reservation[:cus_info]
order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S") order_reservation.requested_time = DateTime.parse(order_reservation[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
order_reservation.callback_url = params[:callback_url] order_reservation.callback_url = order_reservation[:callback_url]
order_reservation.transaction_ref = params[:reference] order_reservation.transaction_ref = order_reservation[:reference]
if params[:order_info] if order_reservation[:order_info]
order_reservation.item_count = params[:order_info][:items].count order_reservation.item_count = order_reservation[:order_info][:items].count
order_reservation.payment_type = params[:payment_info][:payment_type] order_reservation.payment_type = order_reservation[:payment_info][:payment_type]
order_reservation.payment_status = params[:payment_info][:payment_status] order_reservation.payment_status = order_reservation[:payment_info][:payment_status]
order_reservation.payment_ref = params[:payment_info][:payment_ref] order_reservation.payment_ref = order_reservation[:payment_info][:payment_ref]
order_reservation.total_amount = params[:payment_info][:sub_total] order_reservation.total_amount = order_reservation[:payment_info][:sub_total]
order_reservation.total_tax = params[:payment_info][:total_tax] order_reservation.total_tax = order_reservation[:payment_info][:total_tax]
order_reservation.discount_amount = params[:payment_info][:discount_amount] order_reservation.discount_amount = order_reservation[:payment_info][:discount_amount]
order_reservation.grand_total = params[:payment_info][:grand_total] order_reservation.grand_total = order_reservation[:payment_info][:grand_total]
order_reservation.order_remark = params[:order_info][:order_remark] order_reservation.order_remark = order_reservation[:order_info][:order_remark]
end end
if params[:reservation_info] if order_reservation[:reservation_info]
order_reservation.total_customer = params[:reservation_info][:total_user] order_reservation.total_customer = order_reservation[:reservation_info][:total_user]
order_reservation.reservation_remark = params[:reservation_info][:reservation_note] order_reservation.reservation_remark = order_reservation[:reservation_info][:reservation_note]
end end
order_reservation.save! order_reservation.save!
if params[:order_info][:items] if order_reservation[:order_info][:items]
params[:order_info][:items].each do |oritem| order_reservation[:order_info][:items].each do |oritem|
OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name], OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name],
oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price], oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price],
oritem[:options],nil,order_reservation.id) oritem[:options],nil,order_reservation.id)
end end
end end
if params[:delivery_info] if order_reservation[:delivery_info]
Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id) Delivery.addDeliveryInfo(order_reservation[:delivery_info],order_reservation.id)
end end
return order_reservation.id, true return order_reservation.id, true
else else