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

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-07-04 15:23:57 +06:30
parent d076e50cdb
commit a3c24e8bf6
11 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/addorders_controller.rb
View File

@@ -96,8 +96,8 @@ class Origami::AddordersController < BaseOrigamiController
end end
def create def create
Rails.logger.debug "Order Source - " + params[:order_source].to_s # Rails.logger.debug "Order Source - " + params[:order_source].to_s
Rails.logger.debug "Table ID - " + params[:table_id].to_s # Rails.logger.debug "Table ID - " + params[:table_id].to_s
is_extra_time = false is_extra_time = false
extra_time = '' extra_time = ''

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

@@ -7,7 +7,7 @@ class Origami::HomeController < BaseOrigamiController
@tables = Table.unscoped.all.active.order('status desc') @tables = Table.unscoped.all.active.order('status desc')
@rooms = Room.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@shop = Shop.first @shop = Shop.first
# @shift = ShiftSale.current_open_shift(current_user.id) # @shift = ShiftSale.current_open_shift(current_user.id)

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

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
@tables = Table.unscoped.all.active.order('status desc') @tables = Table.unscoped.all.active.order('status desc')
@rooms = Room.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
# @shift = ShiftSale.current_open_shift(current_user.id) # @shift = ShiftSale.current_open_shift(current_user.id)
@webview = false @webview = false
if check_mobile if check_mobile
@@ -20,7 +20,7 @@ class Origami::RoomsController < BaseOrigamiController
@tables = Table.unscoped.all.active.order('status desc') @tables = Table.unscoped.all.active.order('status desc')
@rooms = Room.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@room = DiningFacility.find(params[:room_id]) @room = DiningFacility.find(params[:room_id])

7
app/models/order.rb
View File

@@ -44,8 +44,9 @@ class Order < ApplicationRecord
if self.table_id.to_i > 0 if self.table_id.to_i > 0
table = DiningFacility.find(self.table_id) table = DiningFacility.find(self.table_id)
table.status = "occupied" table.update_attributes(status:"occupied")
table.save # table.status = "occupied"
# table.save
end end
else else
@@ -144,7 +145,7 @@ class Order < ApplicationRecord
end end
#if (!menu_item.nil?) #if (!menu_item.nil?)
Rails.logger.debug menu_item # Rails.logger.debug menu_item
set_order_items = Array.new set_order_items = Array.new
##If menu Item set item - must add child items to order as well, where price is only take from menu_item ##If menu Item set item - must add child items to order as well, where price is only take from menu_item
if (menu_item[:type] == "SetMenuItem") if (menu_item[:type] == "SetMenuItem")

24
app/models/order_queue_station.rb
View File

@@ -232,12 +232,15 @@ class OrderQueueStation < ApplicationRecord
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="") order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
# update print status for order items AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
ai.print_status=true # assigned_items =AssignedOrderItem.where("order_id = '#{ order.order_id }'")
ai.save
end
# assigned_items.each do |ai|
# # update print status for order items
# ai.print_status=true
# ai.save
# end
end end
#Print order_item in 1 slip per item #Print order_item in 1 slip per item
@@ -273,9 +276,12 @@ class OrderQueueStation < ApplicationRecord
end end
end end
# update print status for completed same order items # update print status for completed same order items
AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| # AssignedOrderItem.where("order_id = '#{ order.order_id }'").update_all(print_status: true)
ai.print_status=true # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
ai.save # ai.print_status=true
end # ai.save
# end
assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
end end
end end

8
app/models/sale_order.rb
View File

@@ -8,10 +8,10 @@ class SaleOrder < ApplicationRecord
belongs_to :order belongs_to :order
def create_sale_order(sale, order) def create_sale_order(sale, order)
self.sale_id = sale sale_order = SaleOrder.new
self.order_id = order sale_order.sale_id = sale
self.save sale_order.order_id = order
sale_order.save!
end end
private private

4
app/models/shift_sale.rb
View File

@@ -17,8 +17,8 @@ class ShiftSale < ApplicationRecord
belongs_to :employee, :foreign_key => 'employee_id' belongs_to :employee, :foreign_key => 'employee_id'
def self.current_shift def self.current_shift
today_date = DateTime.now.strftime("%Y-%m-%d") # today_date = DateTime.now.strftime("%Y-%m-%d")
shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").take shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").first
return shift return shift
end end

16
app/views/api/restaurant/zones/index.json.jbuilder
View File

@@ -6,25 +6,21 @@ if @zones
#List all tables #List all tables
json.tables zone.tables do |table| json.tables zone.tables do |table|
if table.is_active if table.is_active
booking = table.get_current_booking
json.id table.id json.id table.id
json.name table.name json.name table.name
json.status table.status json.status table.status
json.zone_id table.zone_id #Add this zone_id to keep data structure consistance json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
json.current_booking booking.booking_id rescue "" json.current_booking table.get_current_booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end end
end end
json.rooms zone.rooms do |room| json.rooms zone.rooms do |room|
if room.is_active if room.is_active
booking = room.get_current_booking
json.id room.id json.id room.id
json.name room.name json.name room.name
json.status room.status json.status room.status
json.zone_id room.zone_id #Add this zone_id to keep data structure consistance json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
json.current_booking booking.booking_id rescue "" json.current_booking room.get_current_booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end end
end end
end end
@@ -32,25 +28,21 @@ if @zones
else #list all tables and rooms with out zones else #list all tables and rooms with out zones
json.tables @all_tables do |table| json.tables @all_tables do |table|
if table.is_active if table.is_active
booking = table.get_current_booking
json.id table.id json.id table.id
json.name table.name json.name table.name
json.status table.status json.status table.status
json.zone_id table.zone_id #Add this zone_id to keep data structure consistance json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
json.current_booking booking.booking_id rescue "" json.current_booking table.get_current_booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end end
end end
json.rooms @all_rooms do |room| json.rooms @all_rooms do |room|
if room.is_active if room.is_active
booking = room.get_current_booking
json.id room.id json.id room.id
json.name room.name json.name room.name
json.status room.status json.status room.status
json.zone_id room.zone_id #Add this zone_id to keep data structure consistance json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
json.current_booking booking.booking_id rescue "" json.current_booking room.get_current_booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end end
end end
end end

31
app/views/origami/home/index.html.erb
View File

@@ -50,8 +50,8 @@
<div class="card tables orange text-white" data-id="<%= table.id %>"> <div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
Zone <%= table.zone_id %> <br> Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Zone <%= table.zone_id %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -61,16 +61,16 @@
<div class="card tables orange text-white" data-id="<%= table.id %>"> <div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %> <% end %>
<div class="card-block"> <div class="card-block">
Zone <%= table.zone_id %> <br> Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Zone <%= table.zone_id %>
</div> </div>
</div> </div>
<% end %> <% end %>
<% else %> <% else %>
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
Zone <%= table.zone_id %> <br> Table <%= table.name %> ( <%= table.seater %> Seat ) <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Zone <%= table.zone_id %>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -107,9 +107,24 @@
<div class="tab-pane dining" id="orders" role="tabpanel"> <div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns"> <div class="card-columns">
<% @orders.each do |order| %> <% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>"> <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
<div class="card-block"> <div class="card-block">
<%= order.order_id %> <%
order_status = ""
sale_order = order.sale_orders.first
if sale_order
unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id)
order_status = sale.sale_status
if order_status == 'new'
order_status = order.status
end
end
else
order_status = order.status
end
%>
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
</div> </div>
</div> </div>
<% end %> <% end %>

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

@@ -371,7 +371,9 @@
<% else %> <% else %>
No Tax No Tax
<% end %></strong><br> <% end %></strong><br>
<%if !@webview %>
<button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button> <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
<% end %>
</td> </td>
<td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td> <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
</tr> </tr>

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

@@ -147,7 +147,7 @@
<div class="card-block"> <div class="card-block">
<% <%
order_status = "" order_status = ""
sale_order = SaleOrder.find_by_order_id(order) sale_order = order.sale_orders.first
if sale_order if sale_order
unless sale_order.sale_id.nil? unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id) sale = Sale.find(sale_order.sale_id)
@@ -360,7 +360,9 @@
<% else %> <% else %>
No Tax No Tax
<% end %></strong><br> <% end %></strong><br>
<%if !@webview %>
<button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button> <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
<% end %>
</td> </td>
<td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td> <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
</tr> </tr>