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

change query for origami

Browse Source
This commit is contained in:
phyusin
2018-02-16 17:47:34 +06:30
parent 8b6dd007ad
commit 032e085b6e
4 changed files with 98 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/controllers/origami/home_controller.rb
View File

@@ -27,40 +27,37 @@ class Origami::HomeController < BaseOrigamiController
@membership = MembershipSetting::MembershipSetting @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @payment_methods = PaymentMethodSetting.all
# bookings = Booking.all bookings = Booking.all
# if !bookings.nil? if !bookings.today.nil?
@order_items_count = Hash.new @order_items_count = Hash.new
# bookings.each do |booking| bookings.each do |booking|
# if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
# if !booking.booking_orders.empty? if !booking.booking_orders.empty?
# booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
# order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
# if !order.order_items.empty? if !order.order_items.empty?
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
# else else
# @order_items_count[booking.dining_facility_id] += order.order_items.count @order_items_count[booking.dining_facility_id] += order.order_items.count
# end end
# end end
# end end
# end end
# else else
# if !booking.sale_id.nil? if !booking.sale_id.nil?
# sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
# if sale.sale_status !='completed' if sale.sale_status !='completed'
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
# else else
# @order_items_count[booking.dining_facility_id] = sale.sale_items.count @order_items_count[booking.dining_facility_id] = sale.sale_items.count
# end end
# end end
# end end
# end end
# end end
# end end
puts "@order_items_count"
puts @order_items_count.to_json
@dining.bookings.active.each do |booking| @dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@@ -126,12 +123,12 @@ class Origami::HomeController < BaseOrigamiController
#for bank integration #for bank integration
@checkout_time = Lookup.collection_of('checkout_time') @checkout_time = Lookup.collection_of('checkout_time')
@checkout_alert_time = Lookup.collection_of('checkout_alert_time') @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
#for split bill end
lookup_spit_bill = Lookup.collection_of('split_bill')
@split_bill = 0 #Shop Name in Navbor
if !lookup_spit_bill[0].nil? helper_method :shop_detail
@split_bill = lookup_spit_bill[0][1] def shop_detail
end @shop = Shop.first
end end
private private
@@ -140,9 +137,4 @@ def set_dining
@dining = DiningFacility.find(params[:dining_id]) @dining = DiningFacility.find(params[:dining_id])
end end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end end

62
app/controllers/origami/orders_controller.rb
View File

@@ -43,37 +43,37 @@ class Origami::OrdersController < BaseOrigamiController
end end
end end
# bookings = Booking.all bookings = Booking.all
# if !bookings.nil? if !bookings.today.nil?
# @order_items_count = Hash.new @order_items_count = Hash.new
# bookings.each do |booking| bookings.each do |booking|
# if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
# if !booking.booking_orders.empty? if !booking.booking_orders.empty?
# booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
# order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
# if !order.order_items.empty? if !order.order_items.empty?
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
# else else
# @order_items_count[booking.dining_facility_id] += order.order_items.count @order_items_count[booking.dining_facility_id] += order.order_items.count
# end end
# end end
# end end
# end end
# else else
# if !booking.sale_id.nil? if !booking.sale_id.nil?
# sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
# if sale.sale_status !='completed' if sale.sale_status !='completed'
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
# else else
# @order_items_count[booking.dining_facility_id] = sale.sale_items.count @order_items_count[booking.dining_facility_id] = sale.sale_items.count
# end end
# end end
# end end
# end end
# end end
# end end
end end
#Shop Name in Navbor #Shop Name in Navbor

60
app/controllers/origami/rooms_controller.rb
View File

@@ -23,37 +23,37 @@ class Origami::RoomsController < BaseOrigamiController
@membership = MembershipSetting::MembershipSetting @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @payment_methods = PaymentMethodSetting.all
# bookings = Booking.all bookings = Booking.all
# if !bookings.nil? if !bookings.today.nil?
@order_items_count = Hash.new @order_items_count = Hash.new
# bookings.each do |booking| bookings.each do |booking|
# if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
# if !booking.booking_orders.empty? if !booking.booking_orders.empty?
# booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
# order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
# if !order.order_items.empty? if !order.order_items.empty?
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, order.order_items.count) @order_items_count.store(booking.dining_facility_id, order.order_items.count)
# else else
# @order_items_count[booking.dining_facility_id] += order.order_items.count @order_items_count[booking.dining_facility_id] += order.order_items.count
# end end
# end end
# end end
# end end
# else else
# if !booking.sale_id.nil? if !booking.sale_id.nil?
# sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
# if sale.sale_status !='completed' if sale.sale_status !='completed'
# if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
# @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
# else else
# @order_items_count[booking.dining_facility_id] = sale.sale_items.count @order_items_count[booking.dining_facility_id] = sale.sale_items.count
# end end
# end end
# end end
# end end
# end end
# end end
@room.bookings.active.each do |booking| @room.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'

1
app/models/booking.rb
View File

@@ -9,6 +9,7 @@ class Booking < ApplicationRecord
has_many :booking_orders has_many :booking_orders
has_many :orders, :through => :booking_orders has_many :orders, :through => :booking_orders
scope :active, -> {where("booking_status != 'moved'")} scope :active, -> {where("booking_status != 'moved'")}
scope :today, -> {where("created_at >= #{Time.now.utc}")}
def self.update_dining_facility(booking_arr, newd, old) def self.update_dining_facility(booking_arr, newd, old)
table = DiningFacility.find(newd) table = DiningFacility.find(newd)