From 362789a93eb889cb52ddac82746595a2ab636a98 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 Aug 2017 18:19:07 +0630 Subject: [PATCH] update oqs --- app/assets/javascripts/OQS.js | 9 +- app/controllers/oqs/home_controller.rb | 18 ++- app/views/oqs/home/index.html.erb | 153 +++++++++++++++---------- config/routes.rb | 2 + 4 files changed, 113 insertions(+), 69 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 2097db44..d77a3a6a 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -24,7 +24,7 @@ $(document).ready(function(){ // window.location.reload(1); // }, 10000); - $('.queue_station').on('click',function(){ + $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text(); @@ -68,19 +68,20 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); - $(".order-item-edit").on('click', function(){ + $(document).on('click', '.order-item-edit', function(event){ var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(5); window.location.href = '/oqs/'+ assigned_item_id + "/edit" }); // complete for queue item - $('.order-complete').on('click',function(e){ + + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); var params = { 'id':assigned_item_id }; - + // Call update_delivery_status() for changed delivery and move to delivery $.ajax({ type: 'POST', diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index c4c801fa..0a120ce2 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -69,6 +69,12 @@ class Oqs::HomeController < BaseOqsController render :json => items.to_json end + def get_items_by_oqs + oqs_id = params[:id] + items = queue_items_query(false,oqs_id) + render :json => items.to_json + end + def show end @@ -88,8 +94,15 @@ class Oqs::HomeController < BaseOqsController render :json => removed_item.to_json end + + # Query for OQS with delivery status - def queue_items_query(status) + def queue_items_query(status,oqs_id=nil) + if oqs_id == nil + oqs = '' + else + oqs = " and assigned_order_items.order_queue_station_id = '#{oqs_id}' " + end AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id @@ -99,8 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'") - .group("assigned_order_items.assigned_order_item_id") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'#{oqs}") .order("assigned_order_items.created_at") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index ed27aa13..857d9cb7 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -13,15 +13,15 @@ if qsi.is_active == false status="disabled" end %> -
  • - role="tab" <%= status %>> - <%= qsi[:station_name] %> - > - <%= qsi.assigned_order_items.count %> - - <% if qsi.auto_print %> - (ap) - <% end %> +
  • + + > + <%= qsi.station_name %> + <%= qsi.assigned_order_items.count %> + + <% if qsi.auto_print %> + (ap) + <% end %>
    • <% end %> @@ -76,63 +76,14 @@ - <% - @queue_stations_items.each do |qsi| - %> - -
    role="tabpanel"> + -
    - <% - @queue_items_details.each do |qid| - if qid.price != 0 - if qid.zone_id == qsi[:zone_id] && qid.station_name == qsi[:station_name] - %> -
    -
    -

    - <%= qid.type %> - - <%= qid.zone %> - <%= qid.order_id %> -

    -

    - <%= qid.item_name %> [x - <%= qid.qty %> ] -

    - -

    <%= qid.options == "[]"? "" : qid.options %>

    - -

    - Order at - - <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - - - - <%= qid.item_order_by %> - - -

    - - - -
    -
    - - -
    -
    - <% - end - end - end - %> +
    +
    -
    - - <% end %> - +
    @@ -193,4 +144,82 @@ + diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..599ec8c8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -198,6 +198,8 @@ Rails.application.routes.draw do # Pass assigned_order_item_id get 'print/print/:id', to: "print#print" get 'print/print_order_summary/:id', to: "print#print_order_summary" + + get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs" #dashboard # end