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

membership update

Browse Source
This commit is contained in:
Yan
2017-07-24 19:24:43 +06:30
parent 8db4a8cc05
commit bf9b977cd0
9 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,6 @@ class Crm::CustomersController < BaseCrmController
member_group_id = params[:member_group_id]
if member_group_id.present?
puts "aaaaaaaaa"
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
@@ -106,18 +105,18 @@ class Crm::CustomersController < BaseCrmController
)
rescue HTTParty::Error
response = {status: false, message: "Can't open membership server "}
response = {"status" => false, "message" => "Can't open membership server "}
rescue Net::OpenTimeout
response = { status: false , message: "Can't open membership server "}
response = {"status" => false, "message" => "Can't open membership server "}
rescue OpenURI::HTTPError
response = { status: false, message: "Can't open membership server "}
response = {"status" => false, "message" => "Can't open membership server "}
rescue SocketError
response = { status: false, message: "Can't open membership server "}
end
response = {"status" => false, "message" => "Can't open membership server "}
end
if response["status"] == true
customer = Customer.find(@crm_customers.customer_id)
status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -132,9 +131,9 @@ class Crm::CustomersController < BaseCrmController
customer = Customer.find(@crm_customers.customer_id)
status = customer.update_attributes(membership_type:member_group_id )
if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]}
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]}
else
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] }
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] }
end
end
else

4
app/controllers/oqs/home_controller.rb
View File

@@ -26,6 +26,7 @@ class Oqs::HomeController < BaseOqsController
@queue_stations_items.push({:zone_id => zone_id , :station_name => que.station_name, :is_active => que.is_active , :is_ap => que.auto_print, :item_count => i })
end
# @queue_items_details = @queue_items_details.paginate(:per_page => 10, :page => params[:page])
@queue_stations_items
end
@@ -99,6 +100,7 @@ class Oqs::HomeController < BaseOqsController
left join dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0")
.group("assigned_order_items.assigned_order_item_id")
.order("assigned_order_items.created_at")
end
# Completed Order
@@ -114,6 +116,8 @@ class Oqs::HomeController < BaseOqsController
left join dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
.group("assigned_order_items.order_id")
.limit(20)
.order("assigned_order_items.created_at")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');

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

@@ -181,11 +181,10 @@ class Origami::DiscountsController < BaseOrigamiController
rescue SocketError
response = {:status=> false, :message => "Can't open membership server " }
end
table_id = sale.bookings[0].dining_facility_id
table_type = DiningFacility.find(table_id).type
puts response
puts "sssssssssss"
# Re-calc All Amount in Sale
if response["status"] == true
discount_amount = response["discount_earned"]