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

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-04-02 18:10:47 +06:30
parent c53276f21c
commit 650eb53f51
19 changed files with 351 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Main Menu.xlsx Normal file
View File

Binary file not shown.

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

@@ -381,16 +381,18 @@ $(function() {
item = get_set_item(items); item = get_set_item(items);
customer_display_view(item,"set_add"); customer_display_view(item,"set_add");
var option = '' var option = []
attribute_arr = [] attribute_arr = []
var rowCount = $('.summary-items tbody tr').length+1; var rowCount = $('.summary-items tbody tr').length+1;
code = $('.set-item').attr('data-code'); code = $('.set-item').attr('data-code');
name = $('.set-item').attr('data-name'); name = $('.set-item').attr('data-name');
price = $('.set-item').attr('data-price'); price = $('.set-item').attr('data-price');
option = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); option_name = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
option = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options');
parent = $('.set-item').attr('data-parent'); parent = $('.set-item').attr('data-parent');
total = qty * price ; total = qty * price ;
row ="<tr class='item_box' data-price ='" row ="<tr class='item_box' data-price ='"
+price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='" +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+name+ "' data-code='"+item_code+"' data-instance-code='" +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -398,7 +400,7 @@ $(function() {
+attribute_arr+"' data-options ='" +attribute_arr+"' data-options ='"
+option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>" +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option +'</td>' +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(total).toFixed(2) + parseFloat(total).toFixed(2)
@@ -406,15 +408,16 @@ $(function() {
+'</tr>'; +'</tr>';
$(".summary-items tbody").append(row); $(".summary-items tbody").append(row);
var rowCount = $('.summary-items tbody tr').length+1; var rowCount = $('.summary-items tbody tr').length+1;
var set_option = '' var set_option = []
$(items).each(function(i){ $(items).each(function(i){
code = $(items[i]).attr('data-code'); code = $(items[i]).attr('data-code');
name = $(items[i]).attr('data-name'); name = $(items[i]).attr('data-name');
price = $(items[i]).attr('data-price'); price = $(items[i]).attr('data-price');
set_option = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options'); set_option_name = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options');
set_option= ($(items[i]).attr('data-options') === '') ? '[]' :$(items[i]).attr('data-options');
sub_item = $(items[i]).attr('data-sub-item'); sub_item = $(items[i]).attr('data-sub-item');
total = qty * price ; total = qty * price ;
row ="<tr class='item_box' data-price ='" row ="<tr class='item_box' data-price ='"
+price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='" +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+name+ "' data-code='"+item_code+"' data-instance-code='" +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -422,7 +425,7 @@ $(function() {
+attribute_arr+"' data-options ='" +attribute_arr+"' data-options ='"
+set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>" +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option +'</td>' +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(total).toFixed(2) + parseFloat(total).toFixed(2)

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

@@ -10,7 +10,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
$('#order-detail-slimscroll').slimScroll({ $('#order-detail-slimscroll').slimScroll({
@@ -20,7 +20,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
$('#menu-slimscroll').slimScroll({ $('#menu-slimscroll').slimScroll({
@@ -30,7 +30,7 @@ $(document).ready(function() {
alwaysVisible: false, alwaysVisible: false,
borderRadius: '0', borderRadius: '0',
railBorderRadius: '0', railBorderRadius: '0',
touchScrollStep : 25 touchScrollStep : 50
}); });
// $('.delete').click(function(){ // $('.delete').click(function(){

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

@@ -36,33 +36,39 @@ class Oqs::EditController < BaseOqsController
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" #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)
# order queue stations assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
oqs = assigned_item.order_queue_station
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf if !assigned_items.nil?
assigned_items.each do |assign_item|
# order queue stations
oqs = assign_item.order_queue_station
unique_code="OrderItemPdf" order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim| unique_code="OrderItemPdf"
if order_item_slim[0] == 'OrderSlimPdf' if !order_slim_pdf.empty?
if order_item_slim[1] == '1' order_slim_pdf.each do |order_item_slim|
unique_code="OrderItemSlimPdf" if order_item_slim[0] == 'OrderSlimPdf'
else if order_item_slim[1] == '1'
unique_code="OrderItemPdf" unique_code="OrderItemSlimPdf"
end else
elsif order_item_slim[0] == 'OrderSetPdf' unique_code="OrderItemPdf"
if order_item_slim[1] == '1' end
unique_code="OrderSetItemPdf" elsif order_item_slim[0] == 'OrderSetPdf'
else if order_item_slim[1] == '1'
unique_code="OrderItemPdf" unique_code="OrderSetItemPdf"
else
unique_code="OrderItemPdf"
end
end
end end
end end
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
end end
end end
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
end end
end end

2
app/controllers/oqs/print_controller.rb
View File

@@ -26,7 +26,7 @@ class Oqs::PrintController < ApplicationController
assigned_item_id = params[:id] assigned_item_id = params[:id]
options = params[:options] options = params[:options]
assigned_item = AssignedOrderItem.find(assigned_item_id) assigned_item = AssignedOrderItem.find(assigned_item_id)
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
# order queue stations # order queue stations
oqs = assigned_item.order_queue_station oqs = assigned_item.order_queue_station

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

@@ -431,13 +431,17 @@ class Origami::PaymentsController < BaseOrigamiController
if(Sale.exists?(sale_id)) if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
#calculate cash acmount
cash = saleObj.total_amount
if saleObj.discount_type == "member_discount" if saleObj.discount_type == "member_discount"
saleObj.update_attributes(rounding_adjustment: 0) saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source) saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
end end
saleObj.update_attributes(rounding_adjustment: 0) saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
puts "FOC"
puts saleObj.to_json
sale_payment = SalePayment.new sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark) sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
# For Cashier by Zone # For Cashier by Zone

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

@@ -62,7 +62,8 @@ class Settings::MenusController < ApplicationController
def destroy def destroy
# @settings_menu.destroy # @settings_menu.destroy
abc = Menu.destroyMenu(@settings_menu) abc = Menu.destroyMenu(@settings_menu)
@settings_menu_item_set.destroy
# @settings_menu_item_set.destroy
flash[:notice] = 'Menu was successfully destroyed.' flash[:notice] = 'Menu was successfully destroyed.'
render :json => {:status=> "Success", :url => settings_menus_path }.to_json render :json => {:status=> "Success", :url => settings_menus_path }.to_json
# respond_to do |format| # respond_to do |format|
@@ -71,12 +72,110 @@ class Settings::MenusController < ApplicationController
# end # end
end end
def import def export
if params[:file] @settings_menus = Menu.all.page(params[:page]).per(10)
Menu.import(params[:file]) menu = Menu.find(params[:id])
redirect_to settings_menus_path, notice: "Menu was successfully Imported"
p = Axlsx::Package.new
wb = p.workbook
wb.styles do |s|
time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
title = s.add_style :fg_color => "004586",
:b => true,
:sz => 12
wrap_text = s.add_style :sz => 11,
:alignment => { :horizontal => :left,:vertical => :center ,
:wrap_text => true}
header_text = s.add_style :fg_color=> "090909",
:b => true,
:sz => 12,
:border => { :style => :thin, :color => "00" },
:alignment => { :horizontal => :left,
:vertical => :center ,
:header_text => true}
# Menu Sheet
wb.add_worksheet(name: menu.name) do |sheet|
sheet.add_row ["Name",menu.name], :style=>title
sheet.add_row
sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text
menu.menu_categories.each do |mc|
mc.menu_items.each do |mi|
mi.menu_item_instances.each do |mii|
sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :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
p.serialize("tmp/menus/" + menu.name + ".xlsx")
render :json => {status: true}
end
def import
if params[:file]
status = Menu.import(params[:file], current_user.name)
redirect_to settings_menus_path, notice: status
end
end end
private private

217
app/models/menu.rb
View File

@@ -45,99 +45,142 @@ class Menu < ApplicationRecord
end end
end end
def self.import(file) def self.import(file, created_by)
status = ""
spreadsheet = open_spreadsheet(file) spreadsheet = open_spreadsheet(file)
sheet_count = spreadsheet.sheets.count-1 if spreadsheet.sheets.count > 1
for i in 0..sheet_count do sheet_count = spreadsheet.sheets.count-1
header = spreadsheet.sheet(i).row(1) for i in 0..sheet_count do
sheet_name = spreadsheet.sheets[i] header = spreadsheet.sheet(i).row(1)
sheet_name = spreadsheet.sheets[i]
(2..spreadsheet.sheet(i).last_row).each do |ii| (2..spreadsheet.sheet(i).last_row).each do |ii|
row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose] row = Hash[[header,spreadsheet.sheet(i).row(ii)].transpose]
if sheet_name == "Account" if sheet_name == "Account"
# Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"]) # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
account = Account.find_by_id(row["id"]) account = Account.find_by_id(row["id"])
if account if account
Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"]) Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
else else
Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"]) Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
end end
elsif sheet_name == "Item Set" elsif sheet_name == "Item Set"
# ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty]) # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
item_set = ItemSet.find_by_id(row["id"]) item_set = ItemSet.find_by_id(row["id"])
if item_set if item_set
ItemSet.create( name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty]) ItemSet.create( name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
else else
ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty]) ItemSet.create(id:row["id"], name: row["name"], alt_name: row["alt_name"], min_selectable_qty: row["min_selectable_qty"], max_selectable_qty: row["max_selectable_qty"])
end end
elsif sheet_name == "Menu Item Options" elsif sheet_name == "Menu Item Options"
# MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"]) # MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
item_options = MenuItemOption.find_by_id(row["id"]) item_options = MenuItemOption.find_by_id(row["id"])
if item_options if item_options
MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"]) MenuItemOption.create( option_type: row["option_type"],name: row["name"],value: row["value"])
else else
MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"]) MenuItemOption.create(id:row["id"], option_type: row["option_type"],name: row["name"],value: row["value"])
end end
elsif sheet_name == "Menu Item Attributes" elsif sheet_name == "Menu Item Attributes"
# MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"]) # MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
item_attributes = MenuItemAttribute.find_by_id(row["id"]) item_attributes = MenuItemAttribute.find_by_id(row["id"])
if item_attributes if item_attributes
MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"]) MenuItemAttribute.create( attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
else else
MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"]) MenuItemAttribute.create(id:row["id"], attribute_type: row["attribute_type"],name: row["name"],value: row["value"])
end end
elsif sheet_name == "Menu" elsif sheet_name == "Menu"
menu = Menu.find_by_id(row["id"]) menu = Menu.find_by_id(row["id"])
if menu if menu
Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"]) Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
else else
Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"]) Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
end end
elsif sheet_name == "Menu Category" elsif sheet_name == "Menu Category"
# MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"]) # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
menu_category = MenuCategory.find_by_id(row["id"]) menu_category = MenuCategory.find_by_id(row["id"])
if menu_category if menu_category
MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"]) MenuCategory.create(menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
else else
MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"]) MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
end end
elsif sheet_name == "Menu Item" elsif sheet_name == "Menu Item"
# MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"]) # MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: row["item_attributes"], item_options: row["item_options"], account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
menu_item = MenuItem.find_by_id(row["id"]) menu_item = MenuItem.find_by_id(row["id"])
if menu_item if menu_item
MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"]) MenuItem.create(item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
else else
MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"]) MenuItem.create(id:row["id"], item_code: row["item_code"], name: row["name"], alt_name: row["alt_name"], image_path: row["image_path"], description: row["description"], information: row["information"], unit: row["unit"], type: row["type"], menu_category_id: row["menu_category_id"], item_attributes: JSON.parse(row["item_attributes"]), item_options: JSON.parse(row["item_options"]), account_id: row["account_id"], min_qty: row["min_qty"], taxable: row["taxable"], is_sub_item: row["is_sub_item"], is_available: row["is_available"], created_by: row["created_by"])
end end
elsif sheet_name == "Menu Item Instance" elsif sheet_name == "Menu Item Instance"
# MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"]) # MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: row["item_attributes"], price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
item_instance = MenuItemInstance.find_by_id(row["id"]) item_instance = MenuItemInstance.find_by_id(row["id"])
if item_instance if item_instance
MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"]) MenuItemInstance.create(menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
else else
MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"]) MenuItemInstance.create(id:row["id"], menu_item_id: row["menu_item_id"].to_i, item_instance_code: row["item_instance_code"], item_instance_name: row["item_instance_name"], item_attributes: JSON.parse(row["item_attributes"]), price: row["price"], is_on_promotion: row["is_on_promotion"], promotion_price: row["promotion_price"], is_available: row["is_available"], is_default: row["is_default"])
end end
elsif sheet_name == "Menu Instance Item Set" elsif sheet_name == "Menu Instance Item Set"
# MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"]) # MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"]) menu_instance_set = MenuInstanceItemSet.find_by_id(row["id"])
if menu_instance_set if menu_instance_set
MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"]) MenuInstanceItemSet.create(item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
else else
MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"]) MenuInstanceItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_instance_id: row["menu_item_instance_id"])
end end
elsif sheet_name == "Menu Item Set" elsif sheet_name == "Menu Item Set"
# MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"]) # MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
menu_item_set = MenuItemSet.find_by_id(row["id"]) menu_item_set = MenuItemSet.find_by_id(row["id"])
if menu_item_set if menu_item_set
MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"]) MenuItemSet.create(item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
else else
MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"]) MenuItemSet.create(id:row["id"], item_set_id: row["item_set_id"], menu_item_id: row["menu_item_id"])
end
end end
end end
end end
end else
# Menu by Menu Import
accs = Account.all
account_id = 1
if accs.length > 0
account_id = accs[0].id
else
status = "No Account Created."
end
sheet = spreadsheet.sheet(0)
menu = sheet.row(1)[1]
imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by})
(4..sheet.last_row).each do |ii|
row = Hash[[sheet.row(3),sheet.row(ii)].transpose]
menu_cat = MenuCategory.find_by_code(row["Category Code"])
if !menu_cat
menu_cat = MenuCategory.create({menu_id: imported_menu.id, code: row["Category Code"], name: row["Category Name"], alt_name: '', order_by: (ii - 3), created_by: created_by, menu_category_id: nil, is_available: 1})
# else
# status = status + "Category Code already exists."
end
menu_itm = MenuItem.find_by_item_code(row["Item Code"])
if !menu_itm
menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", account_id: account_id, is_sub_item: 0, is_available: 1, created_by: created_by)
# else
# status = status + "Item Code already exists for " + row["Item Name"] + "."
end
menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"])
if !menu_inst
imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: "[]", price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: false)
# else
# status = status + "Instance Code already exists for " + row["Instance Name"] + "."
end
end
end
# if status == ''
status="Menu Imported!"
# end
return status
end end
def self.open_spreadsheet(file) def self.open_spreadsheet(file)

2
app/models/menu_category.rb
View File

@@ -33,7 +33,7 @@ class MenuCategory < ApplicationRecord
abc = MenuItem.deleteRecursive(item) abc = MenuItem.deleteRecursive(item)
end end
menu_category.destroy menu_category.destroy
return false return true
end end
end end

48
app/models/menu_item.rb
View File

@@ -55,27 +55,35 @@ class MenuItem < ApplicationRecord
def self.deleteRecursive(menu_item) def self.deleteRecursive(menu_item)
# find the sub menu item of current item # find the sub menu item of current item
sub_menu_items = MenuItem.where("id=?",menu_item.id) # sub_menu_items = MenuItem.where("id=?",menu_item.id)
if sub_menu_items.length != 0 # if sub_menu_items.length != 0
sub_menu_items.each do |subitem| # # sub_menu_items.each do |subitem|
# if deleteRecursive(subitem) # # # if deleteRecursive(subitem)
# end # # # end
end # # end
# find the instances of current menu item # # find the instances of current menu item
instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) # instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
instances.each do |instance| # instances.each do |instance|
instance.destroy # instance.menu_instance_item_sets.destroy_all
end # end
menu_item.destroy # menu_item.menu_item_sets.destroy_all
return true # return true
else # else
instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) # instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
instances.each do |instance| # instances.each do |instance|
instance.destroy # instance.menu_instance_item_sets.destroy_all
end # end
menu_item.destroy # menu_item.menu_item_sets.destroy_all
return false # return true
# end
instances = MenuItemInstance.where("menu_item_id=?",menu_item.id)
instances.each do |instance|
instance.menu_instance_item_sets.destroy_all
instance.destroy
end end
menu_item.menu_item_sets.destroy_all
menu_item.destroy
return true
end end
# private # private

4
app/models/sale.rb
View File

@@ -361,6 +361,8 @@ class Sale < ApplicationRecord
end end
end end
compute_tax(sale, total_taxable, total_discount, order_source)
sale.total_amount = subtotal_price sale.total_amount = subtotal_price
sale.total_discount = total_discount sale.total_discount = total_discount
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -371,8 +373,6 @@ class Sale < ApplicationRecord
# adjust_rounding # adjust_rounding
sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total) sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
compute_tax(sale, total_taxable, total_discount, order_source)
sale.save! sale.save!
end end

6
app/models/sale_payment.rb
View File

@@ -263,10 +263,12 @@ class SalePayment < ApplicationRecord
self.payment_method = "foc" self.payment_method = "foc"
self.payment_amount = self.received_amount self.payment_amount = self.received_amount
self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f # self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
self.outstanding_amount = 0.00
self.payment_status = "paid" self.payment_status = "paid"
payment_method = self.save! payment_method = self.save!
sale_update_payment_status(self.received_amount) # sale_update_payment_status(self.received_amount)
sale_update_payment_status(0)
return payment_status return payment_status
end end

2
app/views/layouts/_header.html.erb
View File

@@ -101,7 +101,7 @@
type: method, type: method,
url: url , url: url ,
success: function(data) { success: function(data) {
location.href = data.url; location.href = data.url;
} }
}); });
} else { } else {

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

@@ -300,7 +300,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
JSON.parse(order_item.set_menu_items).each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>

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

@@ -370,7 +370,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% if !order_item.set_menu_items.nil? <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
JSON.parse(order_item.set_menu_items).each do |item_instance| %> JSON.parse(order_item.set_menu_items).each do |item_instance| %>
<br><span class="font-13"> <br><span class="font-13">
<%= item_instance["item_instance_name"] %> <%= item_instance["item_instance_name"] %>

0
app/views/settings/menus/export.html.erb Normal file
View File

27
app/views/settings/menus/index.html.erb
View File

@@ -62,9 +62,12 @@
<!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> --> <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td> <td>
<%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
</td> <a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="btn btn-primary btn-sm waves-effect" style="height: 33px;">
</tr> <i class="material-icons" style="top: 0px;">backup</i>
<% end %> </a>
</td>
</tr>
<% end %>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -101,3 +104,21 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).ready(function(){
$("#export-xlsx").on('click', function(){
var menu_id= $(this).attr('data-attr');
console.log(menu_id);
$.ajax({
type: "GET",
url: "/settings/menus/" + menu_id + "/export",
success: function(result){
if(result.status){
swal("Success", "Export Success...", "success");
}
}
});
});
});
</script>

2
config/routes.rb
View File

@@ -313,6 +313,8 @@ scope "(:locale)", locale: /en|mm/ do
resources :menu_categories, only: [:new, :create, :edit, :delete] resources :menu_categories, only: [:new, :create, :edit, :delete]
end end
get '/menus/:id/export' => 'menus#export'
resources :item_sets resources :item_sets
resources :menu_item_sets resources :menu_item_sets

2
lib/tasks/clear_data.rake
View File

@@ -17,7 +17,7 @@ namespace :clear do
Survey.delete_all Survey.delete_all
DiningFacility.update_all(status:'available') DiningFacility.update_all(status:'available')
CashierTerminal.update_all(is_currently_login: 0) CashierTerminal.update_all(is_currently_login: 0)
SeedGenerator.where("id > 1").update(:current => 0, :next => 1) SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
puts "Clear Data Done." puts "Clear Data Done."
end end