From b1c5495d955c189a59d76ba3017b74950fb17ec2 Mon Sep 17 00:00:00 2001 From: Zin Moe Date: Tue, 25 Feb 2020 17:02:22 +0630 Subject: [PATCH] modify mobile order page --- app/assets/javascripts/custom.js | 1 - .../foodcourt/food_court_controller.rb | 1 - .../foodcourt/orders_controller.rb | 16 +- app/models/sale.rb | 22 ++ app/views/foodcourt/addorders/detail.html.erb | 2 +- .../foodcourt/orders/app_orders.html.erb | 191 +++++++++++------- 6 files changed, 144 insertions(+), 89 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 6d8092cc..abde0bd5 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -24,7 +24,6 @@ $(document).ready(function() { }); $('#order-detail-slimscroll').slimScroll({ - // height: '250px', height: $('#order-detail-slimscroll').attr('data-height'), // height: height-$('#order-detail-slimscroll').attr('data-height'), size: '5px', diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb index 88c8a327..0fd51763 100644 --- a/app/controllers/foodcourt/food_court_controller.rb +++ b/app/controllers/foodcourt/food_court_controller.rb @@ -43,7 +43,6 @@ class Foodcourt::FoodCourtController < ApplicationController end end @app_order_new_count = Booking.select("bookings.*,customers.*") - .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_id") .joins(" JOIN sales ON bookings.sale_id=sales.sale_id") .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id") diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb index f8108b77..2049fd38 100755 --- a/app/controllers/foodcourt/orders_controller.rb +++ b/app/controllers/foodcourt/orders_controller.rb @@ -54,9 +54,11 @@ class Foodcourt::OrdersController < BaseFoodcourtController end end def app_orders + # @pending_orders = Sale.pending_order('food_court') + # @completed = Sale.completed_sale('food_court') + if !params[:booking_id].nil? && !params[:booking_id].blank? @booking = Booking.select("orders.*,bookings.*,customers.*") - .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_id") .joins("JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id") .joins("JOIN customers ON orders.customer_id=customers.customer_id") @@ -66,15 +68,11 @@ class Foodcourt::OrdersController < BaseFoodcourtController @order_id =@booking.order_id @sale_data = Sale.find_by_sale_id(@booking.sale_id) end - @bookings = Booking.select("bookings.*,customers.*") - .joins("JOIN dining_facilities ON dining_facilities.id=bookings.dining_facility_id") - .joins(" JOIN sales ON bookings.sale_id=sales.sale_id") - .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") - .joins("JOIN orders ON orders.order_id=booking_orders.order_id") - .joins("JOIN order_items ON orders.order_id=order_items.order_id") - .joins("JOIN customers ON orders.customer_id=customers.customer_id") - .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid',Date.today).order("bookings.created_at desc").uniq + + @completed, @bookings = Sale.get_mobile_orders + end + def completed customer =Customer.find_by_customer_id(params[:customer_id]) phone_number =customer.contact_no diff --git a/app/models/sale.rb b/app/models/sale.rb index 385700ac..dd7cacf5 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -667,6 +667,28 @@ class Sale < ApplicationRecord end + def self.get_mobile_orders + @bookings = Booking.select("bookings.*,customers.*") + .joins(" JOIN sales ON bookings.sale_id=sales.sale_id") + .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") + .joins("JOIN orders ON orders.order_id=booking_orders.order_id") + .joins("JOIN order_items ON orders.order_id=order_items.order_id") + .joins("JOIN customers ON orders.customer_id=customers.customer_id") + .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid', Date.today) + .order("bookings.created_at desc").uniq + + @competed = [] + @assigns = [] + @bookings.each do |b| + if b.booking_status == 'completed' + @competed << b + else + @assigns << b + end + end + return @competed, @assigns + end + #Generate new Receipt No when it is not assigned def generate_receipt_no #shop_code and client_code diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb index 2a337c28..24fb2b07 100644 --- a/app/views/foodcourt/addorders/detail.html.erb +++ b/app/views/foodcourt/addorders/detail.html.erb @@ -165,7 +165,7 @@
-
+
diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb index 5ad4af5d..e8abb2f6 100644 --- a/app/views/foodcourt/orders/app_orders.html.erb +++ b/app/views/foodcourt/orders/app_orders.html.erb @@ -7,68 +7,103 @@ } <%= javascript_include_tag 'custom', 'data-turbolinks-track': 'reload' %> -<% if @booking.nil?%> -
-
    -
  1. Foodcourt
    2. -
  2. Mobile Orders
    3. - - <%= link_to 'Back', foodcourt_food_court_path %> - -
-
-<% end %> + + + + +
-
+ +
<% if !@booking.nil?%> -
+
<% else %>
<% end %> -
-
- <% bk_color ='' %> - <% @bookings.each do |bk| - bk_status ='completed' - if bk.booking_status =='assign' - bk_status ='new' - end - if !@booking.nil? - if bk.booking_id == @booking.booking_id - bk_color ='bg-red' +
+ +
+
+
+ <% bk_color ='' %> + <% @bookings.each do |bk| + bk_status ='new' + + if !@booking.nil? + if bk.booking_id == @booking.booking_id + bk_color ='bg-secondary' + else + bk_color =bk.booking_status + end else bk_color =bk.booking_status - end - else - bk_color =bk.booking_status - end %> - <%= link_to foodcourt_app_order_by_booking_path(booking_id:bk.booking_id) do %> -
-
- Cus Ph :<%= bk.contact_no %>Order Time :<%= bk.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
- Order No :<%= bk.orders[0].order_id %><%= bk_status %>
-
+ end %> + <%= link_to foodcourt_app_order_by_booking_path(booking_id:bk.booking_id), class: 'item-card' do %> +
+
+ Cus Ph :<%= bk.contact_no %>Order Time :<%= bk.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ Order No :<%= bk.orders[0].order_id %><%= bk_status %>
+
<% end %> <% end %> +
+
+
+ + +
+
+ <% bk_color ='' %> + <% @completed.each do |c| %> + <% + if !@booking.nil? + if c.booking_id == @booking.booking_id + bk_color ='bg-secondary' + else + bk_color = c.booking_status + end + else + bk_color = c.booking_status + end + %> + <%= link_to foodcourt_app_order_by_booking_path(booking_id: c.booking_id, active: 'completed'), class: 'item-card' do %> +
+
+ Cus Ph :<%= c.contact_no %>Order Time :<%= c.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ Order No :<%= c.orders[0].order_id %>competed
+
+ <% end %> + <% end %>
+
+ <% if !@booking.nil?%> -
+ +
-
- ORDER DETAILS | Table-<%=@booking.dining_facility.name%>
- Booking - <%=@booking.booking_id%>
- Order No- <%=@booking.order_id%> -
-
-
-
+
+ ORDER DETAILS | Table-<%=@booking.dining_facility.try(:name)%>
+ Booking - <%=@booking.booking_id%>
+ Order No - <%=@booking.order_id%> +
+
+
+
+
@@ -79,49 +114,50 @@ - <% sub_total = 0 - count = 0 + <% + sub_total = 0 + count = 0 %> <% @sale_data.sale_items.each do |sale_item| count += 1 - %> + %> <% sub_total += sale_item.price%> - - - - <%end %> - + + + + <%end %> +
<%= count %> <%=sale_item.product_name%>@<%=number_with_precision( sale_item.unit_price, precision: precision.to_i )%><%=sale_item.qty%><%=(number_with_precision(sale_item.price, precision: precision.to_i ))%>
<%=sale_item.qty%><%=(number_with_precision(sale_item.price, precision: precision.to_i ))%>
-
- - - - - - - - - - - - - - - - - - - - - -
Sub Total<%=number_with_precision(sub_total, precision: precision.to_i)%>
(Discount)(<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)
Total Tax<%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Rounding Adj<%= number_with_precision(@sale_data.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Grand Total<%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
- -
-
+
+
+ + + + + + + + + + + + + + + + + + + + + +
Sub Total<%=number_with_precision(sub_total, precision: precision.to_i)%>
(Discount)(<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)
Total Tax<%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Rounding Adj<%= number_with_precision(@sale_data.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
Grand Total<%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%>
+ +
@@ -190,6 +226,7 @@