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

check shift update data

Browse Source
This commit is contained in:
phyusin
2018-03-09 11:54:35 +06:30
parent d7d5f8afc7
commit 21d39349d3
7 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/addorder.js
View File

@@ -46,8 +46,8 @@ $(function() {
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '" + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>" + options +"' data-image='"+image_path+"'>"
+"<i class='fa fa-plus material-icons'>" +"<i class='fa fa-bars material-icons'>"
+'add</i>' +'view_list</i>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -146,7 +146,7 @@ $(function() {
promotion_price = menu_items[field].promotion_price; promotion_price = menu_items[field].promotion_price;
}else{ }else{
fa_plus = 'material-icons'; fa_plus = 'material-icons';
add = 'add' add = 'view_list'
menu_item_box = 'menu_item_box'; menu_item_box = 'menu_item_box';
data_target = 'sx_item_detailModal'; data_target = 'sx_item_detailModal';
data_modal = '' data_modal = ''

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

@@ -30,33 +30,33 @@ class Origami::HomeController < BaseOrigamiController
bookings = Booking.all bookings = Booking.all
if !bookings.today.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
@dining.bookings.active.each do |booking| @dining.bookings.active.each do |booking|

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

@@ -26,33 +26,33 @@ class Origami::RoomsController < BaseOrigamiController
bookings = Booking.all bookings = Booking.all
if !bookings.today.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|

2
app/models/sale_payment.rb
View File

@@ -359,7 +359,7 @@ class SalePayment < ApplicationRecord
if check_foc if check_foc
update_shift update_shift
elsif paid_amount != "0.0" elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
update_shift update_shift
end end
end end

16
app/views/origami/home/show.html.erb
View File

@@ -50,11 +50,11 @@
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(table.id) %> <% if @order_items_count.key?(table.id) %>
(Orders : <%= @order_items_count[table.id] %>) (Orders : <%= @order_items_count[table.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="float-right font-12 new_text_<%= table.id %>"> billed</span> <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
<div style="font-size:12px;"></div> <div style="font-size:12px;"></div>
</div> </div>
@@ -67,11 +67,11 @@
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(table.id) %> <% if @order_items_count.key?(table.id) %>
(Orders : <%= @order_items_count[table.id] %>) (Orders : <%= @order_items_count[table.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="float-right font-12 new_text_<%= table.id %>"> new</span> <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
</div> </div>
</div> </div>
@@ -97,11 +97,11 @@
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>"> <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(room.id) %> <% if @order_items_count.key?(room.id) %>
(Orders : <%= @order_items_count[room.id] %>) (Orders : <%= @order_items_count[room.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="float-right font-12 new_text_<%= room.id %>"> billed</span> <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
</div> </div>
</div> </div>
@@ -109,11 +109,11 @@
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>"> <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(room.id) %> <% if @order_items_count.key?(room.id) %>
(Orders : <%= @order_items_count[room.id] %>) (Orders : <%= @order_items_count[room.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="float-right font-12 new_text_<%= room.id %>"> new</span> <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
</div> </div>
</div> </div>

16
app/views/origami/rooms/show.html.erb
View File

@@ -50,11 +50,11 @@
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(table.id) %> <% if @order_items_count.key?(table.id) %>
(Orders : <%= @order_items_count[table.id] %>) (Orders : <%= @order_items_count[table.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="pull-right font-12 new_text_<%= table.id %>"> billed</span> <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
</div> </div>
</div> </div>
@@ -66,11 +66,11 @@
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(table.id) %> <% if @order_items_count.key?(table.id) %>
(Orders : <%= @order_items_count[table.id] %>) (Orders : <%= @order_items_count[table.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="pull-right font-12 new_text_<%= table.id %>"> new</span> <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
</div> </div>
</div> </div>
@@ -97,11 +97,11 @@
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>"> <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(room.id) %> <% if @order_items_count.key?(room.id) %>
(Orders : <%= @order_items_count[room.id] %>) (Orders : <%= @order_items_count[room.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="pull-right font-12 new_text_<%= room.id %>"> billed</span> <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
<div style="font-size:12px;"></div> <div style="font-size:12px;"></div>
</div> </div>
@@ -110,11 +110,11 @@
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>"> <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if !@order_items_count.nil? %> <!-- <% if !@order_items_count.nil? %>
<% if @order_items_count.key?(room.id) %> <% if @order_items_count.key?(room.id) %>
(Orders : <%= @order_items_count[room.id] %>) (Orders : <%= @order_items_count[room.id] %>)
<% end %> <% end %>
<% end %> <% end %> -->
<span class="pull-right font-12 new_text_<%= room.id %>"> new</span> <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
</div> </div>
</div> </div>

2
lib/tasks/clear_data.rake
View File

@@ -17,7 +17,7 @@ namespace :clear do
Survey.delete_all Survey.delete_all
DiningFacility.update_all(status:'available') DiningFacility.update_all(status:'available')
CashierTerminal.update_all(is_currently_login: 0) CashierTerminal.update_all(is_currently_login: 0)
SeedGenerator.where("id > 1").update(:current => 0, :next => 0) SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
puts "Clear Data Done." puts "Clear Data Done."
end end
end end