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

change some func:

Browse Source
This commit is contained in:
phyusin
2018-05-02 16:33:04 +06:30
parent 0e87ba87f3
commit 965962e49d
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/channels/order_reservation.js
View File

@@ -9,21 +9,22 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', {
var order = data.data;
if(order.length > 0){
$('.order_reserve_cable tbody').html("");
$(".nav-item.red > a > p.num").text(order.length);
$.each(order, function(key,value){
var rowCount = key+1;
var date = new Date(value.created_at);
var deliveries = value["delivery"];
// var deliveries = value["delivery"];
var isPM = date.getHours() >= 12;
var isMidday = date.getHours() == 12;
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ date.getDate();
var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate()>10?date.getDate() : '0'+date.getDate());
var delivery_type = "";
if(deliveries.delivery_type == "service"){
if(value.delivery_type == "service"){
delivery_type = "DELIVERY";
}else if(deliveries.delivery_type == "pick_up"){
}else if(value.delivery_type == "pick_up"){
delivery_type = "PICK-UP";
}else{
delivery_type = "DIRECT DELIVERY";