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_material_ui

Browse Source
This commit is contained in:
Aung Myo
2018-01-08 09:44:47 +06:30
parent c8b7417f6a 4a9030d441
commit 770f80b12e
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@@ -35,11 +35,20 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
Extra Time
category_code = Ext001
category_code = Ext002
category_code = ExtC001 //for morning menu cat:
category_code = ExtC002 //for evening menu cat:
instance_code = Extim30, Extim60 //for morning menu
instance_code = Extie30, Extie60 //for evening menu
Order Item & Order Summary Slim
*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
1) settings/print_settings
2) app/controllers/oqs/edit_controller.rb
3) app/controllers/oqs/print_controller.rb
4) app/models/order_queue_station.rb
5) app/models/printer/order_queue_printer.rb
6) app/models/printer/receipt_printer.rb
* ToDo list
1. Cloud Sync

5
app/controllers/reports/saleitem_controller.rb
View File

@@ -25,7 +25,7 @@ class Reports::SaleitemController < BaseReportController
@sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
@menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
@sale_data.each {|cate| @menu_cate_count[cate.menu_category_id] += 1}
@sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
@totalByAccount = Hash.new {|hash, key| hash[key] = 0}
@@ -64,6 +64,9 @@ class Reports::SaleitemController < BaseReportController
date_arr.push(str)
end
@totalByAccount = Hash.new {|hash, key| hash[key] = 0}
@sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
out = {:status => 'ok', :message => date_arr}
respond_to do |format|

2
app/models/sale.rb
View File

@@ -665,7 +665,7 @@ def self.get_item_query()
# "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.where("i.item_instance_code IS NOT NULL")
query = query.group("i.product_name").order("mi.account_id desc")
query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
end
def self.get_other_charges()

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

@@ -8,7 +8,9 @@
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<% if menu.menu_category_id.nil?%>
<% if menu.menu_category_id.nil? %>
<% if @table.get_current_checkout_booking.nil? %>
<% if !menu.code.include? "SPL" %>
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -16,7 +18,17 @@
</ul>
</a>
</li>
<% end%>
<% else %>
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<% end%>
<%end %>
<!-- <li class="nav-item menu_category">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>

9
app/views/reports/saleitem/index.html.erb
View File

@@ -110,9 +110,8 @@
</tr>
<!-- sub total -->
<% @menu_cate_count.each do |key,value| %>
<% if sale.menu_category_id == key %>
<% @menu_cate_count.each do |key,value| %>
<% if sale.account_id == key %>
<% count = count + 1 %>
<% sub_total += sale.grand_total %>
<% sub_qty += sale.total_item %>
@@ -128,10 +127,10 @@
<% sub_qty = 0 %>
<% count = 0%>
<% end %>
<% end %>
<% end %>
<!-- end sub total -->
<% end %>
<!-- end sub total -->
<% end %>
<!--Other Charges -->
<% if @other_charges.present? %>
<tr>