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

update jade integration card use for all shop

Browse Source
This commit is contained in:
Aung Myo
2017-08-24 11:29:04 +06:30
parent 352037641b
commit 7b90acd2c1
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/crm/customers_controller.rb
View File

@@ -33,8 +33,6 @@ class Crm::CustomersController < BaseCrmController
end
end
end
puts @crm_customers
#@crm_customers = Customer.all
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
@crm_customer = Customer.new
@count_customer = Customer.count_customer

5
app/controllers/origami/customers_controller.rb
View File

@@ -36,12 +36,13 @@ class Origami::CustomersController < BaseOrigamiController
@crm_customers.customer_type = "Dinein"
@crm_customers.tax_profiles = ["1", "2"]
@crm_customers.save
@crm_customers = Customer.search(filter)
else
@crm_customers = {:status=> response["status"],:message=>response["message"] }
@crm_customers = [{"customer_id": response["status"],"message": response["message"] }]
end
end
end
puts @crm_customers
render :json => @crm_customers.to_json
end

8
app/models/customer.rb
View File

@@ -129,8 +129,7 @@ class Customer < ApplicationRecord
sales = Sale.where("rebate_status = 'false'")
sales.each do |sale|
if sale.customer.membership_id
response = self.rebat(Sale.find(sale.sale_id))
puts response.to_json
response = self.rebat(Sale.find(sale.sale_id))
if response["status"] == true
status = sale.update_attributes(rebate_status: "true")
end
@@ -188,8 +187,7 @@ class Customer < ApplicationRecord
response = { "status": false, "message": "Can't connect server"}
end
return response
puts response.to_json
return response
end
end
end
@@ -224,8 +222,6 @@ class Customer < ApplicationRecord
rescue SocketError
response = { status: false, message: "Can't connect server"}
end
puts "sssssssssssss"
puts response.to_json
return response
end

16
app/views/origami/customers/index.html.erb
View File

@@ -261,21 +261,21 @@
url: "get_customer" ,
data: { filter : customer_mamber_card_no ,type :"card"},
dataType: "json",
success: function(data) {
if (data.status == false) {
success: function(data) {
if (data[0].customer_id == false) {
$.alert({
title: 'Alert!',
content: data.message,
content: data[0].message,
type: 'red',
typeAnimated: true,
btnClass: 'btn-danger',
});
}else{
customer_id = data[0].customer_id;
customer_name = data[0].name;
update_sale(customer_id, customer_name,sale_id);
}
if (data.status == undefined) {
customer_id = data[0].customer_id;
customer_name = data[0].name;
update_sale(customer_id, customer_name,sale_id);
}
}
});
}