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

remove git conflict

Browse Source
This commit is contained in:
phyusin
2018-09-07 17:44:57 +06:30
parent aecccffa1e
commit fa421ee718
7 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,6 +307,18 @@ function show_order_detail(url,sr_no){
$('#expected_time').text('');
}
if((data.pickup_time!=undefined) && (data.pickup_time!=null)){
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;
$('.pickup-time').show();
$('#pickup_time').text(pickup_datetime? pickup_datetime : '');
}else{
$('.pickup-time').hide();
$('#pickup_time').text('');
}
item_list.empty();
if(items!=undefined && items!=""){