Merge branch 'main' into FYST-2082-redirect-all-existing-ty-24-fyst-ur-ls-to-fileyourstatetaxes-org

Author: Drew Proebstel

.circleci/config.yml

@@ -54,11 +54,16 @@ commands:
     steps:
       - restore_cache:
           key: bundle-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Configure Git credentials for private gems
+          command: |
+            git config --global url."https://x-access-token:${HONEYCRISP_PAT}@github.com/".insteadOf "https://github.com/"
       - run:
           name: install bundler & ruby dependencies
           command: |
-            gem install bundler:2.3.5 --no-document && \
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            gem install bundler:2.5.18 --no-document
+            bundle config set --local path 'vendor/bundle'
+            bundle install --jobs=4 --retry=3
       - save_cache:
           key: bundle-{{ checksum "Gemfile.lock" }}
           paths: [/mnt/ramdisk/vendor/bundle]

.github/workflows/heroku-pull-request.yml

@@ -75,7 +75,7 @@ jobs:
             LOG_LEVEL=info \
             RAILS_SERVE_STATIC_FILES=enabled \
             RAILS_MASTER_KEY=${{ secrets.HEROKU_RAILS_MASTER_KEY }} \
-            BUNDLE_GITHUB__COM=${{ secrets.BUNDLE_GITHUB__COM }} \
+            BUNDLE_GITHUB__COM=x-access-token:${{ secrets.HONEYCRISP_PAT }} \
             FRAUD_INDICATORS_KEY=${{ secrets.FRAUD_INDICATORS_KEY }} \
             HEROKU_DNS_AWS_ACCESS_KEY_ID=${{ secrets.HEROKU_DNS_AWS_ACCESS_KEY_ID }} \
             HEROKU_DNS_SECRET_ACCESS_KEY=${{ secrets.HEROKU_DNS_SECRET_ACCESS_KEY }} \

app/controllers/hub/organizations_controller.rb

@@ -95,7 +95,7 @@ def activate_all_role_param
 
     def organization_form_params
       params.require(:hub_organization_form).permit(
-        :name, :is_independent, :states, :coalition_id, :timezone, :accepts_itin_applicants, :capacity_limit, :allows_greeters, source_parameters_attributes: [:_destroy, :id, :code]
+        :name, :is_independent, :states, :coalition_id, :timezone, :accepts_itin_applicants, :capacity_limit, :allows_greeters, :national_overflow_location, source_parameters_attributes: [:_destroy, :id, :code]
       )
     end
 

app/forms/hub/organization_form.rb

@@ -4,7 +4,7 @@ class OrganizationForm < Form
 
     attr_accessor :organization
 
-    set_attributes_for :organization, :name, :coalition_id, :accepts_itin_applicants, :timezone, :capacity_limit, :allows_greeters
+    set_attributes_for :organization, :name, :coalition_id, :accepts_itin_applicants, :timezone, :capacity_limit, :allows_greeters, :national_overflow_location
     set_attributes_for :state_routing_targets, :states
     set_attributes_for :organization_synthetic_attributes, :is_independent
 

app/views/hub/organizations/_organization_form.html.erb

@@ -26,6 +26,7 @@
 
 <%= f.hub_checkbox(:allows_greeters, t('hub.organizations.form.allows_greeters'), options: { checked_value: true, unchecked_value: false, **local_assigns[:additional_options] }) %> <!-- local_assigns[:additional_options] sets default to true for new orgs -->
 <%= f.hub_checkbox(:accepts_itin_applicants, "Accepts ITIN applicants", options: { checked_value: true, unchecked_value: false }) %>
+<%= f.hub_checkbox(:national_overflow_location, "Allows National Routing", options: { checked_value: true, unchecked_value: false }) %>
 <div>
   <%= f.continue t("general.save") %>
 </div>

spec/forms/hub/organization_form_spec.rb

@@ -103,6 +103,7 @@
         capacity_limit: 9001,
         allows_greeters: true,
         accepts_itin_applicants: true,
+        national_overflow_location: true,
         is_independent: "yes",
         states: "CA"
       }.merge(extra_params)
@@ -117,6 +118,7 @@
           capacity_limit: 9001,
           allows_greeters: true,
           accepts_itin_applicants: true,
+          national_overflow_location: true,
           is_independent: "yes",
           states: "CA"
         }
@@ -140,6 +142,7 @@
           capacity_limit: "-5",
           allows_greeters: true,
           accepts_itin_applicants: true,
+          national_overflow_location: true,
           is_independent: "yes",
           states: "CA"
         }
@@ -163,6 +166,7 @@
           capacity_limit: "-5",
           allows_greeters: true,
           accepts_itin_applicants: true,
+          national_overflow_location: true,
           is_independent: "yes",
           states: "CA"
         }
@@ -185,6 +189,7 @@
       expect(organization.capacity_limit).to eq(9001)
       expect(organization.allows_greeters).to eq true
       expect(organization.accepts_itin_applicants).to eq true
+      expect(organization.national_overflow_location).to eq true
     end
 
     context "when is_independent is yes" do