Skip to content

Commit

Permalink
don't use billing_street_number
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Fenner committed Feb 29, 2020
1 parent 791021c commit a110e23
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion app/controllers/export_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ def organizations
accountType: provider.member_type_label,
generalContactEmail: provider.system_email,
groupEmail: provider.group_email,
billingStreetNumber: provider.billing_street_number,
billingStreet: provider.billing_address,
billingPostalCode: provider.billing_post_code,
billingCity: provider.billing_city,
Expand Down
7 changes: 0 additions & 7 deletions app/models/provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ class Provider < ActiveRecord::Base
department: { type: :text},
city: { type: :text },
country: { type: :keyword },
streetNumber: { type: :text },
address: { type: :text }}
indexes :technical_contact, type: :object, properties: {
email: { type: :text },
Expand Down Expand Up @@ -209,7 +208,6 @@ def as_indexed_json(options={})
"salesforce_id" => salesforce_id,
"globus_uuid" => globus_uuid,
"billing_information" => {
"streetNumber" => billing_street_number,
"address" => billing_address,
"organization" => billing_organization,
"department" => billing_department,
Expand Down Expand Up @@ -283,7 +281,6 @@ def csv
voting_contact_email: voting_contact_email,
voting_contact_given_name: voting_contact_given_name,
voting_contact_family_name: voting_contact_family_name,
billing_street_number: billing_street_number,
billing_address: billing_address,
billing_post_code: billing_post_code,
billing_city: billing_city,
Expand Down Expand Up @@ -391,10 +388,6 @@ def billing_organization
billing_information.fetch("organization",nil) if billing_information.present?
end

def billing_street_number
billing_information.fetch("street_number",nil) if billing_information.present?
end

def billing_address
billing_information.fetch("address",nil) if billing_information.present?
end
Expand Down

0 comments on commit a110e23

Please sign in to comment.