diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 2b2d27a6..402f317d 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -8,6 +8,7 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] # sale_id sale_data = Sale.find_by_sale_id(sale_id) sale_items = SaleItem.where("sale_id=?",sale_id) + member_info = nil # Print for First Bill to Customer @@ -17,7 +18,9 @@ class Origami::PaymentsController < BaseOrigamiController # customer= Customer.where('customer_id=' +.customer_id) customer= Customer.find(sale_data.customer_id) # get member information - member_info = Customer.get_member_account(customer) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -36,6 +39,8 @@ class Origami::PaymentsController < BaseOrigamiController def create cash = params[:cash] sale_id = params[:sale_id] + member_info = nil + if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) sale_payment = SalePayment.new @@ -46,11 +51,14 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) - rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + #shop detail shop_details = Shop.find(1) # get member information - member_info = Customer.get_member_account(customer) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -67,6 +75,7 @@ class Origami::PaymentsController < BaseOrigamiController def show sale_id = params[:sale_id] + if Sale.exists?(sale_id) @cash = 0.0 @other = 0.0 @@ -76,16 +85,16 @@ class Origami::PaymentsController < BaseOrigamiController @mastercount = 0.0 @credit = 0.0 @sale_data = Sale.find_by_sale_id(sale_id) + @balance = 0.00 + @accountable_type = '' #get customer amount @customer = Customer.find(@sale_data.customer_id) # get member information - response = Customer.get_member_account(@customer) - - @balance = 0.00 - @accountable_type = '' - if response["status"]==true + if customer.membership_id != nil + response = Customer.get_member_account(@customer) + if response["status"]==true response["data"].each do |res| if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" @balance += res["balance"] @@ -93,7 +102,8 @@ class Origami::PaymentsController < BaseOrigamiController @accountable_type = "Rebate Balance" end end - end + end + end #end customer amount @@ -119,8 +129,8 @@ class Origami::PaymentsController < BaseOrigamiController end def reprint - sale_id = params[:sale_id] + member_info = nil saleObj = Sale.find(sale_id) @@ -130,8 +140,10 @@ class Origami::PaymentsController < BaseOrigamiController #shop detail shop_details = Shop.find(1) # get member information - member_info = Customer.get_member_account(customer) - rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + if customer.membership_id != nil + member_info = Customer.get_member_account(customer) + rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code)