Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

take out spaces #4354

Merged
merged 14 commits into from
Mar 13, 2024
Merged

take out spaces #4354

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
af91826
take out spaces
tahsinaislam Mar 12, 2024
6901f1f
Tests
tahsinaislam Mar 12, 2024
11c461e
Fix notes
tahsinaislam Mar 13, 2024
c67839a
1099
tahsinaislam Mar 13, 2024
ef0f2c5
Fix slice
tahsinaislam Mar 13, 2024
e6ef967
Fix consistency
tahsinaislam Mar 13, 2024
1f7e966
Fix test
tahsinaislam Mar 13, 2024
d38b828
clean up addresses
tahsinaislam Mar 13, 2024
9a39375
Fix phone numbers
tahsinaislam Mar 13, 2024
8f2911d
Fix typo
tahsinaislam Mar 13, 2024
3a86cd9
Fix
tahsinaislam Mar 13, 2024
866899b
Fix header
tahsinaislam Mar 13, 2024
c99798b
Fix
tahsinaislam Mar 13, 2024
8053ccb
clean code
tahsinaislam Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions app/lib/submission_builder/document.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ def process_mailing_street(xml)
if mailing_street.length > 30
process_long_mailing_street(xml, mailing_street)
else
xml.MAIL_LN_1_ADR @submission.data_source.direct_file_data.mailing_apartment if @submission.data_source.direct_file_data.mailing_apartment.present?
xml.MAIL_LN_2_ADR mailing_street
xml.MAIL_LN_1_ADR @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_apartment.present?
xml.MAIL_LN_2_ADR mailing_street.strip.gsub(/\s+/, ' ')
end
end

Expand All @@ -121,14 +121,14 @@ def process_mailing_apartment(xml, excess_characters, truncated_mailing_street)
apartment = @submission.data_source.direct_file_data.mailing_apartment
if apartment.length + excess_characters.length > 30
truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
xml.MAIL_LN_1_ADR excess_characters + " " + truncated_apartment
xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
else
xml.MAIL_LN_1_ADR excess_characters + " " + apartment
xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
end
else
xml.MAIL_LN_1_ADR excess_characters
xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
end
xml.MAIL_LN_2_ADR truncated_mailing_street
xml.MAIL_LN_2_ADR truncated_mailing_street.strip.gsub(/\s+/, ' ')
end

def process_permanent_street(xml)
Expand All @@ -139,8 +139,8 @@ def process_permanent_street(xml)
if permanent_street.length > 30
process_long_permanent_street(xml, permanent_street)
else
xml.PERM_LN_1_ADR @submission.data_source.permanent_apartment if @submission.data_source.permanent_apartment.present?
xml.PERM_LN_2_ADR permanent_street
xml.PERM_LN_1_ADR @submission.data_source.permanent_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.permanent_apartment.present?
xml.PERM_LN_2_ADR permanent_street.strip.gsub(/\s+/, ' ')
end
end

Expand All @@ -163,14 +163,14 @@ def process_permanent_apartment(xml, excess_characters, truncated_permanent_stre
apartment = @submission.data_source.permanent_apartment
if apartment.length + excess_characters.length > 30
truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
xml.PERM_LN_1_ADR excess_characters + " " + truncated_apartment
xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
else
xml.PERM_LN_1_ADR excess_characters + " " + apartment
xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
end
else
xml.PERM_LN_1_ADR excess_characters
xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
end
xml.PERM_LN_2_ADR truncated_permanent_street
xml.PERM_LN_2_ADR truncated_permanent_street.strip.gsub(/\s+/, ' ')
end
end
end
20 changes: 10 additions & 10 deletions app/lib/submission_builder/ty2022/states/az/individual_return.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ def pdf_documents

def documents_wrapper
xml_doc = build_xml_doc("Form140") do |xml|
xml.LNPriorYrs @submission.data_source.prior_last_names
xml.LNPriorYrs @submission.data_source.prior_last_names&.strip&.gsub(/\s+/, ' ')
xml.FilingStatus filing_status
if @submission.data_source.hoh_qualifying_person_name.present?
xml.QualChildDependentName do
xml.FirstName @submission.data_source.hoh_qualifying_person_name[:first_name]
xml.LastName @submission.data_source.hoh_qualifying_person_name[:last_name]
xml.FirstName @submission.data_source.hoh_qualifying_person_name[:first_name]&.strip&.gsub(/\s+/, ' ')
xml.LastName @submission.data_source.hoh_qualifying_person_name[:last_name]&.strip&.gsub(/\s+/, ' ')
end
end
xml.Exemptions do
Expand All @@ -71,14 +71,14 @@ def documents_wrapper
@submission.data_source.dependents.reject(&:is_qualifying_parent_or_grandparent?).each do |dependent|
xml.DependentDetails do
xml.Name do
xml.FirstName dependent.first_name
xml.MiddleInitial dependent.middle_initial if dependent.middle_initial.present?
xml.LastName dependent.last_name
xml.FirstName dependent.first_name&.strip&.gsub(/\s+/, ' ')
xml.MiddleInitial dependent.middle_initial&.strip&.gsub(/\s+/, ' ') if dependent.middle_initial.present?
xml.LastName dependent.last_name&.strip&.gsub(/\s+/, ' ')
end
unless dependent.ssn.nil?
xml.DependentSSN dependent.ssn.delete('-')
end
xml.RelationShip relationship_key(dependent.relationship)
xml.RelationShip relationship_key(dependent.relationship)&.strip&.gsub(/\s+/, ' ')
xml.NumMonthsLived dependent.months_in_home
if dependent.under_17?
xml.DepUnder17 'X'
Expand All @@ -90,9 +90,9 @@ def documents_wrapper
@submission.data_source.dependents.select(&:is_qualifying_parent_or_grandparent?).each do |dependent|
xml.QualParentsAncestors do
xml.Name do
xml.FirstName dependent.first_name
xml.MiddleInitial dependent.middle_initial if dependent.middle_initial.present?
xml.LastName dependent.last_name
xml.FirstName dependent.first_name&.strip&.gsub(/\s+/, ' ')
xml.MiddleInitial dependent.middle_initial&.strip&.gsub(/\s+/, ' ') if dependent.middle_initial.present?
xml.LastName dependent.last_name&.strip&.gsub(/\s+/, ' ')
end
unless dependent.ssn.nil?
xml.DependentSSN dependent.ssn.delete('-')
Expand Down
14 changes: 7 additions & 7 deletions app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ def document
add_non_zero_claimed_value(xml, :RFND_B4_EDU_AMT, :IT201_LINE_78)
add_non_zero_claimed_value(xml, :RFND_AMT, :IT201_LINE_78B)
if @submission.data_source.confirmed_third_party_designee_yes?
xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name
xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number
xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name&.strip.gsub(/\s+/, ' ')
xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number&.strip&.gsub(/\s+/, ' ')
tahsinaislam marked this conversation as resolved.
Show resolved Hide resolved
end
xml.PR_SGN_IND claimed: 1
if @submission.data_source.spouse_esigned_yes?
xml.SP_SGN_IND claimed: 1
end
if intake.email_address.present?
xml.TP_EMAIL_ADR claimed: intake.email_address
xml.TP_EMAIL_ADR claimed: intake.email_address.strip.gsub(/\s+/, ' ')
elsif intake.direct_file_data.tax_payer_email.present?
xml.TP_EMAIL_ADR claimed: intake.direct_file_data.tax_payer_email
xml.TP_EMAIL_ADR claimed: intake.direct_file_data.tax_payer_email.strip.gsub(/\s+/, ' ')
end
if intake.direct_file_data.fed_adjustments_claimed.present?
xml.IT201FEDADJID do
Expand All @@ -105,9 +105,9 @@ def document
xml.IT201DepExmpInfo do
intake.dependents.each do |dependent|
xml.depInfo do
xml.DEP_CHLD_FRST_NAME claimed: dependent.first_name if dependent.first_name.present?
xml.DEP_CHLD_MI_NAME claimed: dependent.middle_initial if dependent.middle_initial.present?
xml.DEP_CHLD_LAST_NAME claimed: dependent.last_name if dependent.last_name.present?
xml.DEP_CHLD_FRST_NAME claimed: dependent.first_name.strip.gsub(/\s+/, ' ') if dependent.first_name.present?
xml.DEP_CHLD_MI_NAME claimed: dependent.middle_initial.strip.gsub(/\s+/, ' ') if dependent.middle_initial.present?
xml.DEP_CHLD_LAST_NAME claimed: dependent.last_name.strip.gsub(/\s+/, ' ') if dependent.last_name.present?
xml.DEP_RELATION_DESC claimed: dependent.relationship.delete(" ") if dependent.relationship.present?
xml.DEP_SSN_NMBR claimed: dependent.ssn if dependent.ssn.present?
xml.DOB_DT claimed: dependent.dob.strftime("%Y-%m-%d") if dependent.dob.present?
Expand Down
22 changes: 11 additions & 11 deletions app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ def document
# xml.COND_CODE_2_NMBR
if @submission.data_source.confirmed_third_party_designee_yes?
xml.THRD_PRTY_DSGN_IND claimed: 1
xml.THRD_PRTY_PIN_NMBR claimed: @submission.data_source.direct_file_data.third_party_designee_pin if @submission.data_source.direct_file_data.third_party_designee_pin.present?
xml.THRD_PRTY_PIN_NMBR claimed: @submission.data_source.direct_file_data.third_party_designee_pin.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.third_party_designee_pin.present?
end
xml.EXT_TP_ID claimed: @submission.data_source.primary.ssn if @submission.data_source.primary.ssn.present?
xml.ABA_NMBR claimed: @submission.data_source.routing_number if @submission.data_source.routing_number.present?
xml.ABA_NMBR claimed: @submission.data_source.routing_number.strip.gsub(/\s+/, ' ') if @submission.data_source.routing_number.present?
xml.BANK_ACCT_NMBR claimed: @submission.data_source.account_number.delete('-') if @submission.data_source.account_number.present?
if @submission.data_source.account_type.present? && ACCOUNT_TYPES[@submission.data_source.account_type.to_sym] != 0
xml.ACCT_TYPE_CD claimed: ACCOUNT_TYPES[@submission.data_source.account_type.to_sym]
Expand All @@ -49,17 +49,17 @@ def document
# xml.PREP_ZIP_5_ADR
# xml.PREP_EIN_IND
if @submission.data_source.phone_number&.present?
xml.AREACODE_NMBR claimed: @submission.data_source.phone_number[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number[-4, 4]
xml.AREACODE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
elsif @submission.data_source.direct_file_data.phone_number&.present?
xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-4, 4]
xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
elsif @submission.data_source.direct_file_data.cell_phone_number&.present?
xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-4, 4]
xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
end
# xml.DGT4_PHONE_NMBR
xml.FORM_TYPE claimed: "201"
Expand Down
16 changes: 8 additions & 8 deletions app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ def document
build_xml_doc("State1099G", documentId: "State1099G-#{form1099g.id}") do |xml|
if form1099g.payer_name && form1099g.payer_name != ''
xml.PayerName payerNameControl: form1099g.payer_name.gsub(/\s+/, '').upcase[0..3] do
xml.BusinessNameLine1Txt form1099g.payer_name[0..74]
xml.BusinessNameLine1Txt form1099g.payer_name&.strip.gsub(/\s+/, ' ').slice(0..74)
tahsinaislam marked this conversation as resolved.
Show resolved Hide resolved
end
xml.PayerUSAddress do
xml.AddressLine1Txt form1099g.payer_street_address[0..34] if form1099g.payer_street_address.present?
xml.CityNm form1099g.payer_city[0..21] if form1099g.payer_city.present?
xml.AddressLine1Txt form1099g.payer_street_address.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.payer_street_address.present?
xml.CityNm form1099g.payer_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.payer_city.present?
xml.StateAbbreviationCd "NY"
xml.ZIPCd form1099g.payer_zip if form1099g.payer_zip.present?
end
xml.PayerEIN form1099g.payer_tin if form1099g.payer_tin.present?
xml.PayerEIN form1099g.payer_tin.strip.gsub(/\s+/, ' ') if form1099g.payer_tin.present?
end
recipient = if form1099g.recipient_primary?
form1099g.intake.primary
elsif form1099g.recipient_spouse?
form1099g.intake.spouse
end
xml.RecipientSSN recipient.ssn if recipient.ssn.present?
xml.RecipientName recipient.full_name if recipient.full_name.present?
xml.RecipientName recipient.full_name.strip.gsub(/\s+/, ' ') if recipient.full_name.present?
xml.RecipientUSAddress do
xml.AddressLine1Txt form1099g.recipient_address_line1[0..34] if form1099g.recipient_address_line1.present?
xml.AddressLine2Txt form1099g.recipient_address_line2[0..34] if form1099g.recipient_address_line2.present?
xml.CityNm form1099g.recipient_city[0..21] if form1099g.recipient_city.present?
xml.AddressLine1Txt form1099g.recipient_address_line1.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line1.present?
xml.AddressLine2Txt form1099g.recipient_address_line2.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line2.present?
xml.CityNm form1099g.recipient_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.recipient_city.present?
xml.StateAbbreviationCd "NY"
xml.ZIPCd form1099g.recipient_zip if form1099g.recipient_zip.present?
end
Expand Down
Loading
Loading