update receipt bill payment

This commit is contained in:
Aung Myo
2017-06-21 17:37:16 +06:30
parent 7c5456d712
commit d2549df2e9
8 changed files with 22 additions and 13 deletions

View File

@@ -16,7 +16,7 @@ class Origami::PaymentsController < BaseOrigamiController
unique_code = "ReceiptBillPdf"
customer= Customer.find(saleObj.customer_id)
rebate_amount = Customer.get_membership_transactions(customer)
# get member information
member_info = Customer.get_member_account(customer)
@@ -90,7 +90,7 @@ class Origami::PaymentsController < BaseOrigamiController
# get member information
member_info = Customer.get_member_account(customer)
rebate_amount = Customer.get_membership_transactions(customer)
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -98,7 +98,7 @@ class Origami::PaymentsController < BaseOrigamiController
food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items)
printer = Printer::ReceiptPrinter.new(print_settings)
printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info)
printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info,rebate_amount)
end

View File

@@ -1,7 +1,7 @@
class Reports::DailySaleController < BaseReportController
def index
from, to = get_date_range_from_params
from, to ,report_type = get_date_range_from_params
@sale_data = Sale.daily_sales_list(from,to)
@tax = SaleTax.get_tax(from,to)
end

View File

@@ -1,5 +1,5 @@
class Reports::ReceiptNoController < BaseReportController
load_and_authorize_resource
def index
from, to = get_date_range_from_params
puts "from..."

View File

@@ -1,5 +1,5 @@
class Reports::SaleItemController < BaseReportController
load_and_authorize_resource
def index
from, to, report_type = get_date_range_from_params