This commit is contained in:
Myat Zin Wai Maw
2020-01-13 15:08:04 +06:30
parent 45326750db
commit d794e023b8
6 changed files with 124 additions and 6 deletions

View File

@@ -26,6 +26,7 @@ class Api::PaymentsController < Api::ApiController
sale = Sale.find_by_sale_id(params[:sale_id])
sale_id=sale.sale_id
if !sale.nil?
@paid_amount = sale.grand_total
current_shift = ShiftSale.current_shift
current_login_employee =Employee.find(current_shift.employee_id)
@shop =Shop.find_by_shop_code(sale.shop_code)
@@ -33,8 +34,8 @@ class Api::PaymentsController < Api::ApiController
sale_items = SaleItem.get_all_sale_items(sale_id)
if @status
sale_payment = SalePayment.new
status, @sale, @membership_data = sale_payment.process_payment(sale, current_login_employee, sale.grand_total, "paymal",params[:account_no])
if status == true && @membership_data["status"] == true
@status, @sale, @membership_data = sale_payment.process_payment(sale, current_login_employee, sale.grand_total, "paymal",params[:account_no])
if @status && @membership_data["status"] == true
sale_payment = SalePayment.new
status = sale_payment.process_payment(sale, current_login_employee, 0, "cash")
#card_balance amount for Paymal payment
@@ -151,7 +152,7 @@ class Api::PaymentsController < Api::ApiController
printer = Printer::ReceiptPrinter.new(print_settings)
filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,sale,params[:card_no], item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, 'Foodcourt',current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil,transaction_ref)
render json: JSON.generate({:status => true, :balance_amount => card_balance_amount,:receipt_no => sale.receipt_no,:order_no => latest_order_no, :message => "complete"})
render json: JSON.generate({:status => true, :balance_amount => card_balance_amount,:receipt_no => sale.receipt_no,:order_no => latest_order_no, :message => "complete", :paid_amount => sale.grand_total})
end
end
else