From 23b5d0d344a0eb0251b1235e112950509bb567f8 Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 3 Dec 2019 14:20:09 +0630 Subject: [PATCH] foodcourt/customers --- app/controllers/foodcourt/customers_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/foodcourt/customers_controller.rb b/app/controllers/foodcourt/customers_controller.rb index 853d58c0..316b9837 100644 --- a/app/controllers/foodcourt/customers_controller.rb +++ b/app/controllers/foodcourt/customers_controller.rb @@ -92,12 +92,12 @@ class Foodcourt::CustomersController < BaseFoodcourtController # if flash["errors"] # @crm_customer.valid? # end - @membership_types = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of("member_group_type") + @membership_types = Lookup.collection_of("member_group_type") #get paypar accountno @paypar_accountno = Customer.where("paypar_account_no IS NOT NULL AND paypar_account_no != ''").pluck("paypar_account_no") #for create customer on/off @create_flag = true - lookup_customer = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('customer_settings') + lookup_customer = Lookup.collection_of('customer_settings') if !lookup_customer.empty? lookup_customer.each do |create_setting| if create_setting[0].downcase == "create" @@ -168,9 +168,9 @@ class Foodcourt::CustomersController < BaseFoodcourtController sale = Sale.find_by_receipt_no(receipt_no) @out = [] action_by = current_user.name - membership_setting = MembershipSetting.find_by_membership_type_and_shop_code("paypar_url",@shop.shop_code) + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") if membership_setting.gateway_url - member_actions =MembershipAction.find_by_membership_type_and_shop_code("get_account_balance",@shop.shop_code) + member_actions =MembershipAction.find_by_membership_type("get_account_balance") if member_actions.gateway_url @campaign_type_id = nil url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s