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

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

Browse Source
This commit is contained in:
EikhantMon
2018-07-06 09:56:54 +06:30
parent 6369ec972e 6e197fb37e
commit 56ad5153bc
12 changed files with 60 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -42,7 +42,7 @@ pickle-email-*.html
/config/initializers/* /config/initializers/*
config/deploy/config/* config/deploy/config/*
config/puma.rb config/puma.rb
#config/shops.json config/shops.json
!/log/.keep !/log/.keep
!/tmp/.keep !/tmp/.keep
.ruby-version .ruby-version

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

@@ -1,6 +1,7 @@
$(function() { $(function() {
var role = $('#role').val(); var role = $('#role').val();
var second_display_lookup = $("#display_type");
console.log(second_display_lookup)
type = window.location.href.indexOf("quick_service"); type = window.location.href.indexOf("quick_service");
modify_order = window.location.href.indexOf("modify_order"); modify_order = window.location.href.indexOf("modify_order");
@@ -428,7 +429,7 @@ $(function() {
var items = $('.selected-set'); var items = $('.selected-set');
if (items.length >= min_qty) { if (items.length >= min_qty) {
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_set_item(items); item = get_set_item(items);
customer_display_view(item,"set_add"); customer_display_view(item,"set_add");
} }
@@ -756,7 +757,7 @@ $(function() {
$('.add_to_order').attr('data-options',JSON.stringify(option_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
$('.add_to_order').attr('data-opt',JSON.stringify(option_arr)); $('.add_to_order').attr('data-opt',JSON.stringify(option_arr));
var item_data = $(this); var item_data = $(this);
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_item(item_data,"add_to_order"); item = get_item(item_data,"add_to_order");
customer_display_view(item,"add"); customer_display_view(item,"add");
} }
@@ -768,7 +769,7 @@ $(function() {
// click plus icon for add // click plus icon for add
$(document).on('click', '.add_icon', function(event){ $(document).on('click', '.add_icon', function(event){
var item_data = $(this); var item_data = $(this);
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_item(item_data,"add_icon"); item = get_item(item_data,"add_icon");
customer_display_view(item,"add"); customer_display_view(item,"add");
} }
@@ -895,7 +896,7 @@ $(function() {
window.location.href = "/origami/room/" + table_id window.location.href = "/origami/room/" + table_id
} }
} }
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
customer_display_view(null,"reload"); customer_display_view(null,"reload");
} }
} }

1
app/controllers/home_controller.rb
View File

@@ -20,6 +20,7 @@ class HomeController < ApplicationController
def index def index
# @employees = Employee.all_emp_except_waiter.order("name asc") # @employees = Employee.all_emp_except_waiter.order("name asc")
@employees = Employee.all.where("is_active = true").order("name asc") @employees = Employee.all.where("is_active = true").order("name asc")
@roles = Lookup.collection_of("employee_roles")
@login_form = LoginForm.new() @login_form = LoginForm.new()
render "layouts/login_dashboard", layout: false render "layouts/login_dashboard", layout: false
end end

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

@@ -18,7 +18,12 @@ class Origami::AddordersController < BaseOrigamiController
if check_mobile if check_mobile
@webview = true @webview = true
end end
display_type = Lookup.find_by_lookup_type("display_type")
if !display_type.nil? && display_type.value==2
@display_type = display_type.value
else
@display_type = nil
end
# if params[:menu] == "true" # if params[:menu] == "true"
@menus = [] @menus = []
@menu = [] @menu = []

31
app/controllers/origami/second_display_controller.rb
View File

@@ -8,24 +8,27 @@ class Origami::SecondDisplayController < BaseOrigamiController
end end
def customer_view def customer_view
if params[:status]!= "billed" display_type = Lookup.find_by_lookup_type("display_type")
tax_profiles = TaxProfile.all.order("order_by asc") if !display_type.nil? && display_type.value==2
else if params[:status]!= "billed"
tax_profiles = nil tax_profiles = TaxProfile.all.order("order_by asc")
end else
if ENV["SERVER_MODE"] == 'cloud' tax_profiles = nil
from = request.subdomain + "." + request.domain end
else if ENV["SERVER_MODE"] == 'cloud'
from = "" from = request.subdomain + "." + request.domain
else
from = ""
end
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
end end
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
# end # end
end end
#Shop Name in Navbor #Shop Name in Navbor
helper_method :shop_detail # helper_method :shop_detail
def shop_detail # def shop_detail
@shop = Shop.first # @shop = Shop.first
end # end
end end

16
app/models/assigned_order_item.rb
View File

@@ -8,14 +8,14 @@ class AssignedOrderItem < ApplicationRecord
belongs_to :order_queue_station belongs_to :order_queue_station
def self.assigned_order_item (order, item_code, instance_code, order_queue_station ) def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
assigned_order_item = AssignedOrderItem.new() assigned_order_item = AssignedOrderItem.new()
assigned_order_item.order = order assigned_order_item.order = order
assigned_order_item.item_code = item_code assigned_order_item.item_code = item_code
assigned_order_item.instance_code = instance_code assigned_order_item.instance_code = instance_code
assigned_order_item.order_queue_station = order_queue_station assigned_order_item.order_queue_station = order_queue_station
assigned_order_item.print_status = false assigned_order_item.print_status = false
assigned_order_item.delivery_status = false assigned_order_item.delivery_status = false
assigned_order_item.save assigned_order_item.save!
end end
def self.assigned_order_item_by_job(order_id) def self.assigned_order_item_by_job(order_id)

4
app/models/order_queue_station.rb
View File

@@ -207,7 +207,7 @@ class OrderQueueStation < ApplicationRecord
private private
#Print order_items in 1 slip #Print order_items in 1 slip
def print_slip(oqs, order, order_items) def print_slip(oqs, order, order_items)
printer = PrintSetting.all printer = PrintSetting.all.order("id ASC")
unique_code="OrderSummaryPdf" unique_code="OrderSummaryPdf"
if !printer.empty? if !printer.empty?
@@ -245,7 +245,7 @@ class OrderQueueStation < ApplicationRecord
#Print order_item in 1 slip per item #Print order_item in 1 slip per item
def print_slip_item(oqs, order, assigned_items) def print_slip_item(oqs, order, assigned_items)
printer = PrintSetting.all printer = PrintSetting.all.order("id ASC")
unique_code="OrderItemPdf" unique_code="OrderItemPdf"
if !printer.empty? if !printer.empty?

4
app/models/printer/order_queue_printer.rb
View File

@@ -70,7 +70,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
print_settings.save! print_settings.save!
end end
print_setting = PrintSetting.all print_setting = PrintSetting.all.order("id ASC")
order=print_query('order_summary', order_id) order=print_query('order_summary', order_id)
# For Print Per Item # For Print Per Item
if oqs.cut_per_item if oqs.cut_per_item
@@ -170,7 +170,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
print_settings.save! print_settings.save!
end end
print_setting = PrintSetting.all print_setting = PrintSetting.all.order("id ASC")
order=print_query('booking_summary', booking_id) order=print_query('booking_summary', booking_id)
# For Print Per Item # For Print Per Item

10
app/models/sale.rb
View File

@@ -415,10 +415,12 @@ class Sale < ApplicationRecord
shop = Shop.first shop = Shop.first
#if tax is not apply create new record #if tax is not apply create new record
SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax| # SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
#delete existing and create new # #delete existing and create new
existing_tax.delete # existing_tax.delete
end # end
taxes = SaleTax.where("sale_id='#{sale.sale_id}'").pluck(:sale_tax_id)
SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all
total_tax_amount = 0 total_tax_amount = 0
tax_incl_exec = "exclusive" tax_incl_exec = "exclusive"

10
app/models/sale_order.rb
View File

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

45
app/views/layouts/login_dashboard.html.erb
View File

@@ -112,49 +112,14 @@
</div> </div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<% @employees.each do |employee| %> <% @roles.each do |role| %>
<%if employee.role == "manager" %> <%if role[1] != "administrator" %>
<li class="nav-item"> <li class="nav-item">role
<a class="nav-link" data-toggle="tab" href="#manager" role="tab"><b>Manager</b></a> <a class="nav-link" data-toggle="tab" href="#<%=role[1]%>" role="tab"><b><%=role[0]%></b></a>
<% break %>
</li>
<% end %>
<% end %>
<% @employees.each do |employee| %>
<%if employee.role == "supervisor" %>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#supervisor" role="tab"><b>Supervisor</b></a>
<% break %>
</li>
<% end %>
<% end %>
<% @employees.each do |employee| %>
<%if employee.role == "cashier" %>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#cashier" role="tab"><b>Cashier</b></a>
<% break %>
</li>
<% end %>
<% end %>
<% @employees.each do |employee| %>
<%if employee.role == "account" %>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#account" role="tab"><b>Accountant</b></a>
<% break %>
</li>
<% end %>
<% end %>
<% @employees.each do |employee| %>
<%if employee.role == "waiter" %>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#waiter" role="tab"><b>Waiter</b></a>
<% break %>
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
<div class="tab-content" style="max-height:650px; overflow:auto"> <div class="tab-content" style="max-height:650px; overflow:auto">

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

@@ -11,6 +11,7 @@
</div> </div>
<input type="hidden" name="type" id="role" value="<%= current_user.role%>"> <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
<input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>"> <input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
<input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
<div class="row m-t--20"> <div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data">
<li class="list-menu"> <li class="list-menu">