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

Browse Source
This commit is contained in:
Yan
2018-01-23 14:40:44 +06:30
parent aa8c2621fc 8d2a928456
commit 773e1d2db0
15 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -34,7 +34,11 @@ ruby 2.4.1p111
java -jar ~/Documents/Jade.jar http://192.168.1.88:3002 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
Person and Extra Time Person and Extra Time
category_code = SPL... //for menu categories category_code = SPL... //for menu categories special
1) must create Person in settings/accounts
2) must create Adult and Child in settings/item_attributes
3) must be P00001 for Adult and P00002 for Child in settings/menu_categories/[cat_id]/simple_menu_items
3) must be PI0001 for Adult and PI0002 for Child in settings/simple_menu_items/[item_id]/menu_item_instances
For Extra Time For Extra Time
item_instance_code item_instance_code

23
app/assets/javascripts/OQS.js
View File

@@ -68,11 +68,14 @@ $(document).on('turbolinks:load', function() {
var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
var set_menu_items = data[field]["set_menu_items"]; var set_menu_items = data[field]["set_menu_items"];
var set_instance_items = ""; var set_instance_items = "";
if(set_menu_items.length > 0){ if(set_menu_items!=null){
$.each(set_menu_items, function(k,val){ if(set_menu_items.length > 0){
set_instance_items += '<br><span class="font-12">'+val+'</span>'; $.each(set_menu_items, function(k,val){
}); set_instance_items += '<br><span class="font-12">'+val+'</span>';
} });
}
}
row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">' row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
+'<div class="card-block">' +'<div class="card-block">'
+'<div class="row">' +'<div class="row">'
@@ -146,10 +149,12 @@ $(document).on('turbolinks:load', function() {
var parse_data = JSON.parse(data); var parse_data = JSON.parse(data);
var set_menu_items = parse_data.set_menu_items; var set_menu_items = parse_data.set_menu_items;
var set_instance_items = ""; var set_instance_items = "";
if(set_menu_items.length > 0){ if(set_menu_items!=null){
$.each(set_menu_items, function(k,val){ if(set_menu_items.length > 0){
set_instance_items += '<br><span class="font-12">'+val+'</span>'; $.each(set_menu_items, function(k,val){
}); set_instance_items += '<br><span class="font-12">'+val+'</span>';
});
}
} }
var order_item_row = "<tr>" + var order_item_row = "<tr>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" + "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +

23
app/controllers/oqs/home_controller.rb
View File

@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
@queue_completed_item = completed_order(@filter) @queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty? if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item| @queue_completed_item.each do |queue_item|
if !queue_item.set_menu_items.empty? if !queue_item.set_menu_items.nil?
instance_item_sets = JSON.parse(queue_item.set_menu_items) instance_item_sets = JSON.parse(queue_item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|
@@ -84,8 +84,11 @@ class Oqs::HomeController < BaseOqsController
OrderItem.where("order_id='#{ order_no }'").find_each do |oi| OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
items.push(oi) items.push(oi)
if !items.empty? end
items.each do |item|
if !items.empty?
items.each do |item|
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items) instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|
@@ -106,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
items = queue_items_query(false,oqs_id,filter) items = queue_items_query(false,oqs_id,filter)
if !items.empty? if !items.empty?
items.each do |item| items.each do |item|
instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items)) if !item.set_menu_items.nil?
arr_instance_item_sets = Array.new instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
instance_item_sets.each do |instance_item| arr_instance_item_sets = Array.new
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name instance_item_sets.each do |instance_item|
arr_instance_item_sets.push(item_instance_name) item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end end
item.set_menu_items = arr_instance_item_sets
end end
end end
render :json => items.to_json render :json => items.to_json

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

@@ -41,7 +41,7 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at @date = order.created_at
@booking= booking @booking= booking
order.order_items.each do |item| order.order_items.each do |item|
if !item.set_menu_items.empty? if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items) instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|

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

@@ -35,7 +35,7 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at @date = order.created_at
@booking = booking @booking = booking
order.order_items.each do |item| order.order_items.each do |item|
if !item.set_menu_items.empty? if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items) instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|

4
app/models/ability.rb
View File

@@ -183,7 +183,9 @@ class Ability
can :index, :home can :index, :home
can :show, :home can :show, :home
elsif user.role == "waiter"
can :index, :home
can :show, :home
end end
end end
end end

5
app/models/order.rb
View File

@@ -145,6 +145,9 @@ class Order < ApplicationRecord
set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]}) set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
end end
end end
set_order_items = set_order_items.to_json
else
set_order_items = nil
end end
# not insert with price 0 # not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
# end # end
OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id], OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id, item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name, menu_item[:taxable]) self.employee_name, menu_item[:taxable])
#end #end

8
app/models/sale.rb
View File

@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
order.order_items.each do |item| order.order_items.each do |item|
add_item(item) add_item(item)
if item.set_menu_items != "[]" if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items) add_sub_item(item.set_menu_items)
end end
end end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
items.each do |item| items.each do |item|
add_item(item) add_item(item)
if item.set_menu_items != "[]" if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items) add_sub_item(item.set_menu_items)
end end
@@ -700,8 +700,8 @@ def self.get_item_query()
# "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ") # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
# query = query.where("i.item_instance_code IS NOT NULL") # query = query.where("i.item_instance_code IS NOT NULL")
query = query.group("acc.title,mi.account_id,i.product_name") query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
.order("acc.title desc, mi.account_id desc, i.unit_price asc") .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
end end
def self.get_other_charges() def self.get_other_charges()

2
app/pdf/order_set_item_pdf.rb
View File

@@ -114,7 +114,7 @@ class OrderSetItemPdf < Prawn::Document
end end
#add set menu items #add set menu items
if !order_set_item.set_menu_items.empty? if !order_set_item.set_menu_items.nil?
set_menu_items = JSON.parse(order_set_item.set_menu_items) set_menu_items = JSON.parse(order_set_item.set_menu_items)
if !set_menu_items.empty? if !set_menu_items.empty?
# json_item_instance_code = nil # json_item_instance_code = nil

2
app/pdf/order_summary_set_pdf.rb
View File

@@ -132,7 +132,7 @@ class OrderSummarySetPdf < Prawn::Document
end end
#add set menu items #add set menu items
if !odi.set_menu_items.empty? if !odi.set_menu_items.nil?
set_menu_items = JSON.parse(odi.set_menu_items) set_menu_items = JSON.parse(odi.set_menu_items)
if !set_menu_items.empty? if !set_menu_items.empty?
# json_item_instance_code = nil # json_item_instance_code = nil

4
app/views/api/orders/view_orders.json.jbuilder
View File

@@ -61,12 +61,12 @@ if (@booking)
# For YGN BBQ # For YGN BBQ
# if adult_count > 0 # if adult_count > 0
# json.per_adult_spent (adult_spent/adult_count) * 0.05 # json.per_adult_spent adult_spent + ((adult_spent/adult_count) * 0.05)
# else # else
json.per_adult_spent 0 json.per_adult_spent 0
# end # end
# if child_count > 0 # if child_count > 0
# json.per_child_spent (child_spent/child_count) * 0.05 # json.per_child_spent child_spent + ((child_spent/child_count) * 0.05)
# else # else
json.per_child_spent 0 json.per_child_spent 0
# end # end

2
app/views/oqs/home/index.html.erb
View File

@@ -83,7 +83,7 @@
<span class="order-qty"> <span class="order-qty">
<%= qid.qty %> <%= qid.qty %>
</span> ] </span> ]
<% if !qid.set_menu_items.empty? <% if !qid.set_menu_items.nil?
qid.set_menu_items.each do |item_instance|%> qid.set_menu_items.each do |item_instance|%>
<br><span class="font-12"> <br><span class="font-12">
<%= item_instance %> <%= item_instance %>

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

@@ -257,7 +257,7 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.set_menu_items.empty? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end
@@ -337,7 +337,7 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.set_menu_items.empty? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end

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

@@ -246,7 +246,7 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.set_menu_items.empty? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end
@@ -315,7 +315,7 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.set_menu_items.empty? <% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end

12
app/views/origami/sales/show.html.erb
View File

@@ -201,7 +201,7 @@
<% if @sale.sale_status != 'void' %> <% if @sale.sale_status != 'void' %>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button> <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
<% end %> <% end %>
<!-- <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> --> <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
</div> </div>
</div> </div>
</div> </div>
@@ -271,10 +271,10 @@ $('#back').on('click',function(){
}); });
}); });
// $('#re-print').click(function() { $('#re-print').click(function() {
// var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
// window.location.href = '/origami/'+ sale_id + "/reprint" window.location.href = '/origami/'+ sale_id + "/reprint"
// return false; return false;
// }); });
</script> </script>