Merge pull request #3042 from bitzesty/staging

Production < staging
bitzesty · Aug 19, 2024 · e43ceff · e43ceff
2 parents 28da16f + d454eb8
commit e43ceff
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/app/form_pointers/latest_year_generator.rb b/app/form_pointers/latest_year_generator.rb
@@ -1,16 +1,19 @@
 module LatestYearGenerator
   def calculate_last_year(form_answer, day, month)
-    # Conditional latest year
-    # If from 7th of September to December -> then previous year
-    # If from January to 6th of September -> then current year
-    #
-
-    @form_answer_award_year = form_answer.award_year.year if @form_answer_award_year.blank?
-
-    if form_answer.financial_year_changeable? || (month.to_i == 9 && day.to_i > 6) || month.to_i > 9
-      @form_answer_award_year - 2
+    if form_answer.document["most_recent_financial_year"]
+      @form_answer_award_year = form_answer.document["most_recent_financial_year"].to_i
     else
-      @form_answer_award_year - 1
+      # Conditional latest year
+      # If from 7th of September to December -> then previous year
+      # If from January to 6th of September -> then current year
+      #
+      @form_answer_award_year = form_answer.award_year.year if @form_answer_award_year.blank?
+
+      if form_answer.financial_year_changeable? || (month.to_i == 9 && day.to_i > 6) || month.to_i > 9
+        @form_answer_award_year - 2
+      else
+        @form_answer_award_year - 1
+      end
     end
   end
 end