diff --git a/README.md b/README.md index 1d9b2e2a..146f216e 100755 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ Add Feature for Order and Reservation For Price 0 in receipt bill 2) settings/lookups => { type:show_price, name:Show Price, value:1 } + For Price 0 in receipt bill 2) settings/lookups => { type:order_by, name:Order By, value:name } diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index 31343fe5..1156827a 100755 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/app/controllers/origami/product_commissions_controller.rb @@ -91,7 +91,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take Commission.all.each do |com| - if com.product_code.include? @menu_item.item_code && com.active == true + if com.product_code.include? @menu_item.item_code && com.is_active == true @commission = Commission.find(com.id) break end diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 2bee170d..55b09668 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -649,5 +649,4 @@ class ReceiptBillA5Pdf < Prawn::Document end return status end -end - +end \ No newline at end of file diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 18450f51..5f3cdc09 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -637,5 +637,4 @@ class ReceiptBillPdf < Prawn::Document end return status end -end - +end \ No newline at end of file