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

add pickup_time for order reservation

Browse Source
This commit is contained in:
phyusin
2018-09-07 13:33:30 +06:30
parent 8babd8b2ea
commit 0e653155be
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/order_reservation.js
View File

@@ -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 = 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 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)){ if((data.expected_waiting_time!=undefined) && (data.expected_waiting_time!=null)){
// var expDate = new Date(data.expected_waiting_time); // var expDate = new Date(data.expected_waiting_time);
// var exptime = timeFormat(expDate); // var exptime = timeFormat(expDate);
@@ -361,6 +365,7 @@ function show_order_detail(url,sr_no){
address += ", (" +delivery.direction_address+")"; address += ", (" +delivery.direction_address+")";
} }
$('#requested_time').text(requested_date); $('#requested_time').text(requested_date);
$('#pickup_time').text(pickup_datetime);
$('#customer_name').text(data.customer_name); $('#customer_name').text(data.customer_name);
$('#phone').text(data.phone); $('#phone').text(data.phone);
$('#address').text(address); $('#address').text(address);

3
app/models/order_reservation.rb
View File

@@ -57,6 +57,9 @@ class OrderReservation < ApplicationRecord
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]
order_reservation.requested_time = Time.zone.parse(order_reserve[:requested_time]).utc 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.callback_url = order_reserve[:callback_url]
order_reservation.transaction_ref = order_reserve[:reference] order_reservation.transaction_ref = order_reserve[:reference]
if order_reserve[:order_info] if order_reserve[:order_info]

6
app/views/origami/order_reservation/index.html.erb
View File

@@ -429,6 +429,12 @@
<b><span id="expected_time"></span> MINS</b> <b><span id="expected_time"></span> MINS</b>
</td> </td>
</tr> </tr>
<tr>
<td colspan="2" class="body-td align-left">
<span class="font-13">PICK-UP TIME</span><br>
<b id="pickup_time"></b>
</td>
</tr>
<tr> <tr>
<td class="body-td align-left"> <td class="body-td align-left">
<span class="font-13">NAME</span><br> <span class="font-13">NAME</span><br>