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

fix for undefied method type in item pdf

Browse Source
This commit is contained in:
Yan
2017-06-28 15:40:54 +06:30
parent 879a4b366c
commit 5ff75fad7d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ class Origami::RequestBillsController < BaseOrigamiController
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
puts "current_login_employee" puts "current_login_employee"
puts current_login_employee.name puts current_login_employee.name
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else

4
app/models/printer/order_queue_printer.rb
View File

@@ -33,13 +33,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
order=print_query('order_summary', order_id) order=print_query('order_summary', order_id)
# For Print Per Item # For Print Per Item
if oqs.cut_per_item if oqs.cut_per_item
order_items.each do|odi| order.each do|odi|
filename = "tmp/order_item_#{odi.item_name}" + ".pdf" filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
# For Item Options # For Item Options
options = odi.options == "[]"? "" : odi.options options = odi.options == "[]"? "" : odi.options
# check for item not to show # check for item not to show
if odi.price != 0 || odi.price != 10 if odi.price != 0
pdf = OrderItemPdf.new(odi, print_status, options) pdf = OrderItemPdf.new(odi, print_status, options)
# pdf.render_file "tmp/order_item.pdf" # pdf.render_file "tmp/order_item.pdf"
pdf.render_file filename pdf.render_file filename

4
app/views/origami/payments/show.html.erb
View File

@@ -136,13 +136,13 @@
<% if @ppamount != 0.0 %> <% if @ppamount != 0.0 %>
<div class="row payment other-payment-color" style="line-height:30px;height: 30px;margin-bottom: 0px;"> <div class="row payment other-payment-color" style="line-height:30px;height: 30px;margin-bottom: 0px;">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">Paypar</div> <div class="col-md-3">Redeem</div>
<div class="col-md-4" id="ppamount"><%= @ppamount %></div> <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
</div> </div>
<% else %> <% else %>
<div class="row" style="display:none"> <div class="row" style="display:none">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">Paypar</div> <div class="col-md-3">Redeem</div>
<div class="col-md-4" id="ppamount">0.0</div> <div class="col-md-4" id="ppamount">0.0</div>
</div> </div>
<% end %> <% end %>