From 965962e49d4ef008ccc7371d286fbe4c3a62e31b Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 2 May 2018 16:33:04 +0630 Subject: [PATCH] change some func: --- .../javascripts/channels/order_reservation.js | 9 +++++---- app/assets/javascripts/order_reservation.js | 16 ++++++++++++---- .../order_reservation_controller.rb | 3 +-- app/models/order_reservation.rb | 2 +- .../origami/order_reservation/index.html.erb | 5 ++--- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 0a3ef37c..fb42bf82 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -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"; diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index b99dad8d..8f9b3f4d 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -166,10 +166,18 @@ $(function() { } $("#accepted").on("click", function(){ - var requested_time = $("#requested_date_time").text(); - $("#requested_order_time").text(requested_time); - showTimePicker(requested_time); - $("#waiting_timeModal").modal({show : true, backdrop: false, keyboard : false}); + if($(this).text().trim() == "ACCEPT"){ + var requested_time = $("#requested_date_time").text(); + $("#requested_order_time").text(requested_time); + showTimePicker(requested_time); + $("#waiting_timeModal").modal({show : true, backdrop: false, keyboard : false}); + }else{ + var status = $(this).attr("data-value"); + var order_id = $('#order_id').text(); + var callback = $('#callback_url').text(); + var ref_no = $('#ref_no').text(); + callback_url(callback,ref_no,order_id,status); + } }); $("#cancel").on("click", function(){ diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 57337b5e..f34c0f6f 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -59,9 +59,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController order_reservation = params order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) - order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id) - if flag #&& ENV["SERVER_MODE"] != 'cloud' + order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id) ActionCable.server.broadcast "order_reservation_channel",data: order_reservation end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index d60d908e..12f11252 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -201,7 +201,7 @@ class OrderReservation < ApplicationRecord end def self.get_pending_orders - order_reservation = OrderReservation.select("order_reservations.*,deliveries.provider,deliveries.delivery_type") + order_reservation = OrderReservation.select("order_reservations.*,del.provider,del.delivery_type") .joins(" JOIN deliveries as del on del.order_reservation_id=order_reservations.order_reservation_id") .where("order_reservations.status='new'") .order("order_reservations.order_reservation_id desc, order_reservations.created_at desc") diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 9c6df102..0adb528f 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -60,7 +60,7 @@ <%=i%> - <%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> @@ -197,7 +197,6 @@ - <%= order.delivery.to_json %> <% if order.delivery.delivery_type == 'service' %> DELIVERY <% elsif order.delivery.delivery_type == 'pick_up' %> @@ -351,7 +350,7 @@ - EXPECTED WAITING TIME
+ EXPECTED TIME