From e62ba4d6c2cf320adde95eac11fd11a6b7772c88 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 23 Apr 2018 19:20:03 +0630 Subject: [PATCH] change params --- .../order_reservation_controller.rb | 3 +- app/models/order_reservation.rb | 48 +++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index c3c9f39b..61e89c39 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -56,7 +56,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController end 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) # if ENV["SERVER_MODE"] != 'cloud' diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 5aab27ba..8ab87c55 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -12,40 +12,40 @@ class OrderReservation < ApplicationRecord DELIVERED = "delivered" COMPLETED = "completed" - def self.addOrderReservationInfo(params) - check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference]) + def self.addOrderReservationInfo(order_reservation) + check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reservation[:reference]) if check_order_reservation.empty? order_reservation = OrderReservation.new - order_reservation.order_reservation_type = params[:order_type] - order_reservation.customer_id = params[:cus_info] - order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S") - order_reservation.callback_url = params[:callback_url] - order_reservation.transaction_ref = params[:reference] - if params[:order_info] - order_reservation.item_count = params[:order_info][:items].count - order_reservation.payment_type = params[:payment_info][:payment_type] - order_reservation.payment_status = params[:payment_info][:payment_status] - order_reservation.payment_ref = params[:payment_info][:payment_ref] - order_reservation.total_amount = params[:payment_info][:sub_total] - order_reservation.total_tax = params[:payment_info][:total_tax] - order_reservation.discount_amount = params[:payment_info][:discount_amount] - order_reservation.grand_total = params[:payment_info][:grand_total] - order_reservation.order_remark = params[:order_info][:order_remark] + order_reservation.order_reservation_type = order_reservation[:order_type] + order_reservation.customer_id = order_reservation[:cus_info] + order_reservation.requested_time = DateTime.parse(order_reservation[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S") + order_reservation.callback_url = order_reservation[:callback_url] + order_reservation.transaction_ref = order_reservation[:reference] + if order_reservation[:order_info] + order_reservation.item_count = order_reservation[:order_info][:items].count + order_reservation.payment_type = order_reservation[:payment_info][:payment_type] + order_reservation.payment_status = order_reservation[:payment_info][:payment_status] + order_reservation.payment_ref = order_reservation[:payment_info][:payment_ref] + order_reservation.total_amount = order_reservation[:payment_info][:sub_total] + order_reservation.total_tax = order_reservation[:payment_info][:total_tax] + order_reservation.discount_amount = order_reservation[:payment_info][:discount_amount] + order_reservation.grand_total = order_reservation[:payment_info][:grand_total] + order_reservation.order_remark = order_reservation[:order_info][:order_remark] end - if params[:reservation_info] - order_reservation.total_customer = params[:reservation_info][:total_user] - order_reservation.reservation_remark = params[:reservation_info][:reservation_note] + if order_reservation[:reservation_info] + order_reservation.total_customer = order_reservation[:reservation_info][:total_user] + order_reservation.reservation_remark = order_reservation[:reservation_info][:reservation_note] end order_reservation.save! - if params[:order_info][:items] - params[:order_info][:items].each do |oritem| + if order_reservation[:order_info][:items] + 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], oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price], oritem[:options],nil,order_reservation.id) end end - if params[:delivery_info] - Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id) + if order_reservation[:delivery_info] + Delivery.addDeliveryInfo(order_reservation[:delivery_info],order_reservation.id) end return order_reservation.id, true else