diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index d1ed693e..c2942a6f 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -296,6 +296,10 @@ function show_order_detail(url,sr_no){ // var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() >= 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time; var requested_date = getOrderMonth(newDate.getMonth()) +' '+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +', '+newDate.getFullYear()+'('+getOrderDay(newDate.getDay())+')'+' '+time; + var newPickupDate = new Date(data.pickup_time); + var pickup_time = timeFormat(newPickupDate); + var pickup_datetime = getOrderMonth(newPickupDate.getMonth()) +' '+ (newPickupDate.getDate() >= 10? newPickupDate.getDate() : '0' + newPickupDate.getDate()) +', '+newPickupDate.getFullYear()+'('+getOrderDay(newPickupDate.getDay())+')'+' '+pickup_time; + if((data.expected_waiting_time!=undefined) && (data.expected_waiting_time!=null)){ // var expDate = new Date(data.expected_waiting_time); // var exptime = timeFormat(expDate); @@ -361,6 +365,7 @@ function show_order_detail(url,sr_no){ address += ", (" +delivery.direction_address+")"; } $('#requested_time').text(requested_date); + $('#pickup_time').text(pickup_datetime); $('#customer_name').text(data.customer_name); $('#phone').text(data.phone); $('#address').text(address); diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index ae874c72..43d0145e 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -57,6 +57,9 @@ class OrderReservation < ApplicationRecord order_reservation.order_reservation_type = order_reserve[:order_type] order_reservation.customer_id = order_reserve[:cus_info] order_reservation.requested_time = Time.zone.parse(order_reserve[:requested_time]).utc + if order_reserve[:pickup_time] + order_reservation.pickup_time = Time.zone.parse(order_reserve[:pickup_time]).utc + end order_reservation.callback_url = order_reserve[:callback_url] order_reservation.transaction_ref = order_reserve[:reference] if order_reserve[:order_info] diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 9b3fc7da..c82d9ad1 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -429,6 +429,12 @@ MINS + + + PICK-UP TIME
+ + + NAME