bs4 family info fix immigrant fields (#4256)

move script end tag to allow field div to load for bs4, fix exp date parsing
ideacrew · Aug 28, 2024 · f1d5bfa · f1d5bfa
1 parent c0d0b6f
commit f1d5bfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/components/financial_assistance/app/models/financial_assistance/forms/consumer_fields.rb b/components/financial_assistance/app/models/financial_assistance/forms/consumer_fields.rb
@@ -33,7 +33,9 @@ def expiration_date
           end
 
           def expiration_date=(val)
-            @expiration_date = Date.strptime(val, '%m/%d/%Y') if val.to_s.present?
+            return unless val.to_s.present?
+            date_format = val.match(/\d{4}-\d{2}-\d{2}/) ? "%Y-%m-%d" : "%m/%d/%Y"
+            @expiration_date = Date.strptime(val, date_format)
           end
 
           def us_citizen

diff --git a/...al_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb b/...al_assistance/app/views/financial_assistance/shared/_immigration_document_fields.html.erb
@@ -36,6 +36,7 @@
   <div class="vlp_doc_area col-md-12">
   </div>
 </div>
+<% end %>
 
 <% if vlp_doc_subject.present? %>
   <script type="text/javascript">
@@ -44,4 +45,3 @@
     });
   </script>
 <% end %>
-<% end %>