From efcef4d27b66c029de2a033c3e9b16937f75b988 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 31 Aug 2018 13:49:39 +0630 Subject: [PATCH] update shop note --- .../settings/set_menu_items_controller.rb | 2 +- app/controllers/settings/shops_controller.rb | 2 +- .../settings/simple_menu_items_controller.rb | 2 +- app/pdf/receipt_bill_a5_pdf.rb | 17 +++++++++++++++++ app/pdf/receipt_bill_pdf.rb | 17 +++++++++++++++++ app/views/origami/table_invoices/show.html.erb | 14 ++++++-------- app/views/settings/shops/_form.html.erb | 6 +++++- 7 files changed, 48 insertions(+), 12 deletions(-) diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index c460c362..1243b906 100755 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -13,7 +13,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/1.json def show # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) - @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]) end # GET /settings/menu_items/new diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb index e3f79322..38c3336c 100644 --- a/app/controllers/settings/shops_controller.rb +++ b/app/controllers/settings/shops_controller.rb @@ -101,6 +101,6 @@ class Settings::ShopsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def shop_params - params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info, display_images_attributes: [:id, :shop_id, :name, :image]) + params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info,:note, display_images_attributes: [:id, :shop_id, :name, :image]) end end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 9a7c46db..a6f05dc1 100755 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -13,7 +13,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/1.json def show # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) - @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]) end # GET /settings/menu_items/new diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 26add8dc..92319cba 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -92,6 +92,10 @@ class ReceiptBillA5Pdf < Prawn::Document sign(sale_data) + if shop_details.note != nil + shop_note(printed_status) + end + footer(printed_status) end @@ -647,6 +651,19 @@ class ReceiptBillA5Pdf < Prawn::Document end + def shop_note(shop) + move_down line_move + stroke_horizontal_rule + move_down line_move + + move_down line_move + y_position = cursor + + text "#{shop.note}", :size => self.item_font_size,:align => :left + + move_down line_move + end + def footer(printed_status) move_down line_move stroke_horizontal_rule diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 5224eaea..6185a1ad 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -93,6 +93,10 @@ class ReceiptBillPdf < Prawn::Document sign(sale_data) + if shop_details.note != nil + shop_note(shop_details) + end + footer(printed_status) end @@ -647,6 +651,19 @@ class ReceiptBillPdf < Prawn::Document end + def shop_note(shop) + move_down line_move + stroke_horizontal_rule + move_down line_move + + move_down line_move + y_position = cursor + + text "#{shop.note}", :size => self.item_font_size,:align => :left + + move_down line_move + end + def footer(printed_status) move_down line_move stroke_horizontal_rule diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb index f7b06d06..d16f9581 100644 --- a/app/views/origami/table_invoices/show.html.erb +++ b/app/views/origami/table_invoices/show.html.erb @@ -510,14 +510,12 @@ $('#foc').click(function() { title: "Information!", text: 'Thank You !', }, function () { - // For Server Print - from jade - if ($("#server_mode").val() == "cloud") { - code2lab.printFile(result.filepath.substr(6), result.printer_url); - } - - window.location.href = '/origami'; - - }); + // For Server Print - from jade + if ($("#server_mode").val() == "cloud") { + code2lab.printFile(result.filepath.substr(6), result.printer_url); + } + window.location.href = '/origami'; + }); } } }); diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index bc9bf75d..08fda560 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -23,6 +23,8 @@ <%= f.input :quick_sale_summary %> <%= f.input :calc_tax_order %> <%= f.input :show_account_info %> + + @@ -75,7 +77,9 @@ <%= f.file_field :image, :multiple => false, name: "display_images[image][]", accept: 'audio/mp3', :class => "order" %> - + + + <%= f.input :note, as: :text, :input_html => { :rows => 5} %>
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>