diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 360274fa..37eef687 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -37,7 +37,7 @@ class Origami::RequestBillsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total,member_info) - redirect_to origami_path(@sale_data.sale_id) + # redirect_to origami_path(@sale_data.sale_id) end end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 516f5668..bdeb58a3 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -250,14 +250,16 @@ class ReceiptBillPdf < Prawn::Document end move_down 5 end - stroke_horizontal_rule + end # show member information def member_info(member_info,customer_name,rebate_amount,sale_data) if rebate_amount != nil + if rebate_amount["status"] == true + stroke_horizontal_rule rebate_amount["data"].each do |res| if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Rebate" diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a8f02920..e7b47460 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -28,7 +28,7 @@ - + <% end %> diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 502bcd3f..ac247771 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -12,20 +12,23 @@
<%= queue.id %>
<%= queue.status %>
- <%= @i += 1 %> . Queue No -+ <%= queue.queue_no %> +