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

payment bill added and origami bug fixed

Browse Source
This commit is contained in:
Yan
2017-06-14 19:41:32 +06:30
parent dd9863025f 2da2edc5ec
commit 8cfa2bc5c5
15 changed files with 155 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/origami/home_controller.rb
View File

@@ -15,7 +15,7 @@ class Origami::HomeController < BaseOrigamiController
@completed_orders = Order.get_completed_order()
@booking_orders = Order.get_booking_order_table()
@booking_rooms = Order.get_booking_order_rooms()
@booking_rooms = Order.get_booking_order_rooms()
@orders = Order.get_orders()
end
@@ -68,20 +68,8 @@ class Origami::HomeController < BaseOrigamiController
def get_customer
@customer = Customer.find(params[:customer_id])
membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("get_all_member_account")
merchant_uid = memberaction.merchant_account_id.to_s
auth_token = memberaction.auth_token.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
:headers => {
'Content-Type' => 'application/json',
'Accept' => 'application/json'
}
)
response = Customer.get_member_account(@customer)
respond_to do |format|
format.js do

10
app/controllers/origami/payments_controller.rb
View File

@@ -13,10 +13,10 @@ class Origami::PaymentsController < BaseOrigamiController
sale_payment.process_payment(saleObj, @user, cash, "cash")
unique_code = "ReceiptBillPdf"
customer= Customer.where('customer_id=' + saleObj.customer_id)
customer= Customer.find(saleObj.customer_id)
# get member information
response = get_member_information(customer, "get_all_member_account")
member_info = Customer.get_member_account(customer)
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -25,7 +25,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,@sale_items,@sale_data,customer.name, food_total, beverage_total)
printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info)
end
end
@@ -38,10 +38,10 @@ class Origami::PaymentsController < BaseOrigamiController
@sale_data = Sale.find_by_sale_id(sale_id)
#get customer amount
@customer = Customer.find(@sale_data.customer_id)
@customer = Customer.find(@sale_data.customer_id)
# get member information
response = get_member_information(@customer, "get_all_member_account")
response = Customer.get_member_account(@customer)
@balance = 0.00
@accountable_type = ''