control normal user no call paypar

This commit is contained in:
Yan
2017-07-05 17:59:15 +06:30
parent da71a542ee
commit efa7b8997b

View File

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