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-15 17:36:05 +06:30
parent de05c4423a 1eb6cd5bcf
commit a72ae34a46
8 changed files with 126 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ class Reports::SaleitemController < BaseReportController
end
@type = params[:sale_type]
@sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
@sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
@sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
@@ -62,7 +62,6 @@ class Reports::SaleitemController < BaseReportController
def show
from, to, report_type = get_date_range_from_params
puts "aaaaaaaaaaaaaaaaaaaaaaaaaa"
@sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
date_arr = Array.new

77
app/controllers/settings/menus_controller.rb
View File

@@ -99,10 +99,10 @@ class Settings::MenusController < ApplicationController
sheet.add_row ["Name",menu.name], :style=>title
sheet.add_row
sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Price", "Is Default"], :style=>header_text
sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Instance Attribute", "Price", "Is Default"], :style=>header_text
menu.menu_categories.each do |mc|
mc.menu_items.each do |mi|
attributes = ""
mc.menu_items.each do |mi|
attributes = ""
i=0
if mi.item_attributes.length > 0
mi.item_attributes.each do |mia|
@@ -119,8 +119,8 @@ class Settings::MenusController < ApplicationController
options = ""
i=0
if mi.item_options.length > 0
mi.item_options.each do |mia|
option = MenuItemOption.find(mia)
mi.item_options.each do |mio|
option = MenuItemOption.find(mio)
if i == mi.item_options.length - 1
options = options + option.name
else
@@ -131,68 +131,15 @@ class Settings::MenusController < ApplicationController
end
mi.menu_item_instances.each do |mii|
sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, attributes, options, mii.item_instance_code, mii.item_instance_name, mii.price, mii.is_default], :style=>wrap_text
attribute = ""
if mii.item_attributes.length > 0
attribute = MenuItemAttribute.find(mii.item_attributes[0]).name
end
sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, attributes, options, mii.item_instance_code, mii.item_instance_name, attribute, mii.price, mii.is_default], :style=>wrap_text
end
end
end
# # Category
# menu.menu_categories.each do |mc|
# sheet.add_row ["Category"], :style=>wrap_text
# sheet.add_row %w(id menu_id code name alt_name order_by created_by menu_category_id is_available), :style=>header_text
# sheet.add_row [mc.id, mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available], :style=>wrap_text
# sheet.add_row
# # Menu Item
# mc.menu_items.each do |mi|
# sheet.add_row ["Menu Item"], :style=>wrap_text
# sheet.add_row %w(id item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id min_qty taxable is_sub_item is_available created_by), :style=>header_text
# sheet.add_row [mi.id,mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by], :style=>wrap_text
# sheet.add_row
# # Menu Item Instance
# sheet.add_row ["Menu Item Instance"], :style=>wrap_text
# sheet.add_row %w(id menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default), :style=>header_text
# mi.menu_item_instances.each do |mii|
# sheet.add_row [mii.id, mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default], :style=>wrap_text
# end
# sheet.add_row
# end
# end
end
# # Account
# wb.add_worksheet(name: "Account") do |sheet|
# sheet.add_row %w(id title account_type discount point bonus rebate), :style=>header_text
# Account.all.each do |acc|
# sheet.add_row [acc.id, acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate], :style=>wrap_text
# end
# end
# # Item set
# wb.add_worksheet(name: "Item Set") do |sheet|
# sheet.add_row %w(id name alt_name min_selectable_qty max_selectable_qty), :style=>header_text
# ItemSet.all.each do |set|
# sheet.add_row [set.id,set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty], :style=>wrap_text
# end
# end
# # Item Options
# wb.add_worksheet(name: "Menu Item Options") do |sheet|
# sheet.add_row %w(id option_type name value), :style=>header_text
# MenuItemOption.all.each do |option|
# sheet.add_row [option.id, option.option_type, option.name, option.value], :style=>wrap_text
# end
# end
# # Item Attributes
# wb.add_worksheet(name: "Menu Item Attributes") do |sheet|
# sheet.add_row %w(id attribute_type name value), :style=>header_text
# MenuItemAttribute.all.each do |attr|
# sheet.add_row [attr.id, attr.attribute_type,attr.name,attr.value], :style=>wrap_text
# end
# end
end
end
end
directory_name = "public/menus"