diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 9c905978..71c6fcb7 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -14,6 +14,20 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' $("."+shop_code+" > .nav-item.red > a > p.num").text(order.length); $.each(order, function(key,value){ var active_class = ""; + var rowCount = key+1; + var date = new Date(value.created_at); + var time = timeFormat(date); + 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(value.provider == "food2u" || value.provider == "yangondoor2door"){ + delivery_type = "DELIVERY"; + }else if(value.provider == "pick_up"){ + delivery_type = "PICK-UP"; + }else{ + delivery_type = "DIRECT DELIVERY"; + } + if(key==0){ var order_id = value.order_reservation_id; var sr_no = rowCount; @@ -29,19 +43,6 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' showNewOrderAlert(order[key],shop_code); } } - var rowCount = key+1; - var date = new Date(value.created_at); - var time = timeFormat(date); - 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(value.provider == "food2u" || value.provider == "yangondoor2door"){ - delivery_type = "DELIVERY"; - }else if(value.provider == "pick_up"){ - delivery_type = "PICK-UP"; - }else{ - delivery_type = "DIRECT DELIVERY"; - } row = '' +''+rowCount