diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 99a68fe3..8b9cc4fc 100644 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -27,8 +27,6 @@ class Crm::DiningQueuesController < BaseCrmController def create @dining_queue = DiningQueue.new(dining_queue_params) -puts "ffffffffffff" -puts @queue_no respond_to do |format| if @dining_queue.save format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully created.' } diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 92c4fe3f..ca497b81 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -89,7 +89,7 @@ class Origami::PaymentsController < BaseOrigamiController # get member information member_info = Customer.get_member_account(customer) - + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 9d5742d6..3eebc8f3 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -207,17 +207,18 @@ class ReceiptBillPdf < Prawn::Document # show member information def member_info(member_info) move_down 7 - if member_info["data"] == true + if member_info["status"] == true member_info["data"].each do |res| - stroke_horizontal_rule + move_down 5 y_position = cursor - - bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do - text "#{ res["accountable_type"] } : #{ res["balance"] }", :size => self.item_font_size,:align => :left + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ res["accountable_type"] }", :size => self.item_font_size,:align => :left end - - move_down 5 + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ res["balance"] }" , :size => self.item_font_size,:align => :right + end + end end end