update report

This commit is contained in:
Aung Myo
2017-11-28 19:11:19 +06:30
parent 20d580b2ab
commit 900efb3fa6
7 changed files with 25 additions and 23 deletions

View File

@@ -235,7 +235,7 @@ end
id = @crm_customer.membership_id
member_group_id = params[:member_group_id]
if id.nil? && !member_group_id.nil?
if !id.present? && !member_group_id.nil?
membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("create_membership_customer")
merchant_uid = memberaction.merchant_account_id.to_s
@@ -277,8 +277,6 @@ end
rescue SocketError
response = { status: false}
end
puts "ssssssss"
puts response.to_json
customer = Customer.find(@crm_customer.customer_id)
if response["status"] == true
@@ -337,9 +335,6 @@ end
rescue SocketError
response = { status: false}
end
puts "ssssssss"
puts response.to_json
if response["status"] == true
customer = Customer.find(@crm_customer.customer_id)

View File

@@ -22,7 +22,7 @@ authorize_resource :class => false
@sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@tax_profiles = TaxProfile.order('order_by asc')
puts @sale_taxes.to_json
puts @sale_data.count
puts "sssssss"
puts @tax_profiles.to_json
@from = from