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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-05-16 17:15:17 +06:30
parent fa4c5d075e 29434f2df9
commit dc23df673f
11 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/custom.js
View File

@@ -42,6 +42,15 @@ $(document).ready(function() {
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 50 touchScrollStep : 50
}); });
$('#menu1-slimscroll').slimScroll({
height: height-$('#menu1-slimscroll').attr('data-height'),
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0',
touchScrollStep : 50
});
$('#modal-slimscroll').slimScroll({ $('#modal-slimscroll').slimScroll({
height: height-$('#modal-slimscroll').attr('data-height'), height: height-$('#modal-slimscroll').attr('data-height'),

6
app/controllers/oqs/edit_controller.rb
View File

@@ -39,8 +39,10 @@ class Oqs::EditController < BaseOqsController
if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
# print # print
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") assigned_items = nil
if !assigned_item.nil?
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
end
if !assigned_items.nil? if !assigned_items.nil?
assigned_items.each do |assign_item| assigned_items.each do |assign_item|
# order queue stations # order queue stations

7
app/controllers/origami/payments_controller.rb
View File

@@ -335,10 +335,13 @@ class Origami::PaymentsController < BaseOrigamiController
end end
@sale_data.sale_payments.each do |spay| @sale_data.sale_payments.each do |spay|
if spay.payment_method == "cash" if spay.payment_method == "cash"
@cash = spay.payment_amount @cash = spay.payment_amount
end end
@other_payment += spay.payment_amount if spay.payment_method !="creditnote"
@other_payment += spay.payment_amount
end
if spay.payment_method == "mpu" if spay.payment_method == "mpu"
@other += spay.payment_amount @other += spay.payment_amount
elsif spay.payment_method == "paypar" elsif spay.payment_method == "paypar"

3
app/controllers/origami/void_controller.rb
View File

@@ -114,7 +114,8 @@ class Origami::VoidController < BaseOrigamiController
if customer.membership_id != nil && rebate if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer) member_info = Customer.get_member_account(customer)
rebate_amount = Customer.get_membership_transactions(customer,sale.receipt_no) rebate_amount = Customer.get_membership_transactions(customer,sale.receipt_no)
current_balance = SaleAudit.paymal_search(sale_id) # current_balance = SaleAudit.paymal_search(sale_id)
current_balance = 0
end end
# get printer info # get printer info

56
app/models/order.rb
View File

@@ -285,13 +285,18 @@ class Order < ApplicationRecord
#Process order items and send to order queue #Process order items and send to order queue
def process_order_queue def process_order_queue
if ENV["SERVER_MODE"] != 'cloud' print_status = nil
cup_status = nil
#Send to background job for processing #Send to background job for processing
order = Order.find(self.id) order = Order.find(self.id)
cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
sidekiq = Lookup.find_by_lookup_type("sidekiq") sidekiq = Lookup.find_by_lookup_type("sidekiq")
if ENV["SERVER_MODE"] != 'cloud'
cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
end
if print_status if print_status
if !sidekiq.nil? if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(self.id, self.table_id) OrderQueueProcessorJob.perform_later(self.id, self.table_id)
@@ -304,9 +309,11 @@ class Order < ApplicationRecord
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
else else
cup_start = `#{"sudo service cups start"}` if ENV["SERVER_MODE"] != 'cloud'
cup_status = `#{"sudo service cups status"}` cup_start = `#{"sudo service cups start"}`
print_status = check_cup_status(cup_status) cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
end
if print_status if print_status
if !sidekiq.nil? if !sidekiq.nil?
@@ -320,33 +327,28 @@ class Order < ApplicationRecord
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
else else
msg = ' Print Error ! Please contact to service' if ENV["SERVER_MODE"] != 'cloud'
#if ENV["SERVER_MODE"] != 'cloud'
msg = ' Print Error ! Please contact to service'
ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
#end end
if !sidekiq.nil? if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(self.id, self.table_id) OrderQueueProcessorJob.perform_later(self.id, self.table_id)
else else
if order if order
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
# assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
end end
end end
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
#end
end
end end
#Process order items and send to order queue #Process order items and send to order queue
def self.pay_process_order_queue(id,table_id) def self.pay_process_order_queue(id,table_id)
if ENV["SERVER_MODE"] != 'cloud' # if ENV["SERVER_MODE"] != 'cloud'
sidekiq = Lookup.find_by_lookup_type("sidekiq") sidekiq = Lookup.find_by_lookup_type("sidekiq")
if !sidekiq.nil? if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(id, table_id) OrderQueueProcessorJob.perform_later(id, table_id)
@@ -359,7 +361,7 @@ class Order < ApplicationRecord
assign_order = AssignedOrderItem.assigned_order_item_by_job(id) assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
end # end
end end
def check_cup_status(status) def check_cup_status(status)

1
app/models/sale.rb
View File

@@ -2692,6 +2692,7 @@ end
query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
.joins("join orders as orders on orders.order_id = sale_orders.order_id") .joins("join orders as orders on orders.order_id = sale_orders.order_id")
query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service") query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
query = query.where("DATE_FORMAT(sales.created_at,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
.group("sales.sale_id") .group("sales.sale_id")
end end

56
app/views/origami/addorders/detail.html.erb
View File

@@ -29,7 +29,7 @@
<%end%> <%end%>
</ul> </ul>
</li> </li>
<div id="menu-slimscroll" data-height="0"> <div id="menu1-slimscroll" data-height="0">
<ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar"> <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>"> <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a> <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
@@ -499,30 +499,54 @@
<div class="card-columns" style="column-count: 7;"> <div class="card-columns" style="column-count: 7;">
<%zone.tables.each do |table| %> <%zone.tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<% if table.get_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<% color="red"%> <% color="red"%>
<% else %> <% else %>
<% color="orange"%> <% color="orange"%>
<% end %> <% end %>
<% else %> <% else %>
<% if table.get_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<% color="blue"%> <% color="blue"%>
<% else %> <% else %>
<% color="orange"%> <% color="orange"%>
<% end %> <% end %>
<% end %> <% end %>
<% else %> <% else %>
<% color="green"%> <% color="green"%>
<% end %> <% end %>
<div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>"> <div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
</div> </div>
</div> </div>
<%end%> <%end%>
<%zone.rooms.each do |table| %>
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<% if table.get_checkout_booking.nil? %>
<% color="red"%>
<% else %>
<% color="orange"%>
<% end %>
<% else %>
<% if table.get_checkout_booking.nil? %>
<% color="blue"%>
<% else %>
<% color="orange"%>
<% end %>
<% end %>
<% else %>
<% color="green"%>
<% end %>
<div class="card tables <%=color%> text-white table_<%= table.id %>" data-id="<%= table.id %>" data-type="<%= table.type %>" data-name="<%= table.name %>">
<div class="card-block">
<%= table.name %>
</div>
</div>
<%end%>
</div> </div>
<%end%> <%end%>
<div class="modal-footer p-r-30"> <div class="modal-footer p-r-30">

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

@@ -1,4 +1,4 @@
<div class="container-fluid"> `<div class="container-fluid">
<div id="loading_wrapper" style="display:none;"> <div id="loading_wrapper" style="display:none;">
<div id="loading"></div> <div id="loading"></div>
</div> </div>

2
app/views/origami/pending_order/completed_sale.html.erb
View File

@@ -17,7 +17,7 @@
<% @completed.each do |sale| %> <% @completed.each do |sale| %>
<div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>"> <div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span> <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
</div> </div>
</div> </div>
<% end %> <% end %>

2
app/views/origami/pending_order/index.html.erb
View File

@@ -19,7 +19,7 @@
<% @completed.each do |sale| %> <% @completed.each do |sale| %>
<div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>"> <div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span> <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
</div> </div>
</div> </div>
<% end %> <% end %>

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

@@ -17,7 +17,7 @@
<% @completed.each do |sale| %> <% @completed.each do |sale| %>
<div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>"> <div class="card completed bg-red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span> <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
</div> </div>
</div> </div>
<% end %> <% end %>