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

add font for print setting

Browse Source
This commit is contained in:
Yan
2017-10-11 15:16:40 +06:30
parent 2a9b44366a
commit 4ab89efaf2
16 changed files with 110 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ class Origami::AddordersController < BaseOrigamiController
if (params[:id])
#Pull this menu
@menu = MenuCategory.find_by_id(params[:id])
puts @menu.menu_items[1].item_attributes.to_json
# puts @menu.menu_items[1].item_attributes.to_json
return @menu
else
MenuCategory.current_menu

2
app/controllers/print_settings_controller.rb
View File

@@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def print_setting_params
params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
end
end