Merge pull request #5271 from alphagov/DGarland5-patch-4

Update results.erb

Author: kevindew

Gemfile

@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 
+ruby File.read(".ruby-version").chomp
+
 gem "rails", "6.0.3.2"
 
 gem "ast"

Gemfile.lock

@@ -442,5 +442,8 @@ DEPENDENCIES
   uk_postcode
   webmock
 
+RUBY VERSION
+   ruby 2.7.2p137
+
 BUNDLED WITH
    2.1.4

lib/smart_answer/calculators/business_coronavirus_support_finder_calculator.rb

@@ -10,6 +10,7 @@ class BusinessCoronavirusSupportFinderCalculator
 
     def initialize
       @closed_by_restrictions = []
+      @sectors = []
     end
 
     RULES = {
@@ -20,10 +21,6 @@ def initialize
         calculator.business_size == "0_to_249" &&
           calculator.paye_scheme == "yes"
       },
-      christmas_pub_payment: lambda { |calculator|
-        calculator.business_based == "england" &&
-          calculator.sectors.include?("retail_hospitality_or_leisure")
-      },
       retail_hospitality_leisure_business_rates: lambda { |calculator|
         calculator.business_based == "england" &&
           calculator.non_domestic_property != "no" &&
@@ -46,6 +43,9 @@ def initialize
       kickstart_scheme: lambda { |calculator|
         calculator.business_based != "northern_ireland"
       },
+      vat_reduction: lambda { |calculator|
+        calculator.sectors.include?("retail_hospitality_or_leisure")
+      },
       lrsg_closed_addendum: lambda { |calculator|
         calculator.business_based == "england" &&
           calculator.closed_by_restrictions.include?("national")
@@ -65,6 +65,22 @@ def initialize
       additional_restrictions_grant: lambda { |calculator|
         calculator.business_based == "england"
       },
+      restart_grant: lambda { |calculator|
+        calculator.business_based == "england" &&
+          calculator.sectors.intersection(%w[retail_hospitality_or_leisure personal_care]).any?
+      },
+      council_grants: lambda { |calculator|
+        council_grant_questions = %i[lrsg_closed_addendum
+                                     lrsg_closed
+                                     lrsg_open
+                                     lrsg_sector
+                                     additional_restrictions_grant
+                                     retail_hospitality_leisure_business_rates
+                                     nursery_support
+                                     restart_grant]
+
+        council_grant_questions.any? { |q| calculator.show?(q) }
+      },
     }.freeze
 
     def show?(result_id)

lib/smart_answer_flows/business-coronavirus-support-finder.rb

@@ -81,6 +81,7 @@ def define
         option :nurseries
         option :retail_hospitality_or_leisure
         option :nightclubs_or_adult_entertainment
+        option :personal_care
         none_option
 
         on_response do |response|

lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb

@@ -8,7 +8,8 @@
 
 <% options(
   "nurseries": "Nurseries",
-  "retail_hospitality_or_leisure": "Retail, hospitality or leisure (including pubs)",
+  "retail_hospitality_or_leisure": "Retail, hospitality or leisure (including pubs and gyms)",
   "nightclubs_or_adult_entertainment": "Nightclub, dancehall, or adult entertainment venue",
+  "personal_care": "Personal Care",
   "none": "None of the above",
 ) %>

lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb

@@ -40,27 +40,6 @@ class BusinessCoronavirusSupportFinderCalculatorTest < ActiveSupport::TestCase
         end
       end
 
-      context "christmas_pub_payment" do
-        setup do
-          @calculator.business_based = "england"
-          @calculator.sectors = %w[retail_hospitality_or_leisure]
-        end
-
-        should "return true when criteria met" do
-          assert @calculator.show?(:retail_hospitality_leisure_business_rates)
-        end
-
-        should "return false when in a devolved admininstration" do
-          @calculator.business_based = "scotland"
-          assert_not @calculator.show?(:retail_hospitality_leisure_business_rates)
-        end
-
-        should "return false when not supported business sectors" do
-          @calculator.sectors = %w[none]
-          assert_not @calculator.show?(:retail_hospitality_leisure_business_rates)
-        end
-      end
-
       context "retail_hospitality_leisure_business_rates" do
         setup do
           @calculator.business_based = "england"
@@ -178,6 +157,17 @@ class BusinessCoronavirusSupportFinderCalculatorTest < ActiveSupport::TestCase
         end
       end
 
+      context "vat_reduction" do
+        should "return true when business is in the retail sector" do
+          @calculator.sectors = %w[retail_hospitality_or_leisure]
+          assert @calculator.show?(:vat_reduction)
+        end
+
+        should "return false when business is not in the retail sector" do
+          assert_not @calculator.show?(:vat_reduction)
+        end
+      end
+
       context "lrsg_closed_addendum" do
         should "return true when business closed by national restrictions and based in england" do
           @calculator.business_based = "england"
@@ -269,6 +259,43 @@ class BusinessCoronavirusSupportFinderCalculatorTest < ActiveSupport::TestCase
           assert_not @calculator.show?(:additional_restrictions_grant)
         end
       end
+
+      context "restart_grant" do
+        should "return true when business is based in England and in the retail sector" do
+          @calculator.business_based = "england"
+          @calculator.sectors = %w[retail_hospitality_or_leisure]
+          assert @calculator.show?(:restart_grant)
+        end
+
+        should "return true when business is based in England and in the personal care sector" do
+          @calculator.business_based = "england"
+          @calculator.sectors = %w[personal_care]
+          assert @calculator.show?(:restart_grant)
+        end
+
+        should "return false when business not based in England" do
+          @calculator.business_based = "scotland"
+          @calculator.sectors = %w[retail_hospitality_or_leisure]
+          assert_not @calculator.show?(:restart_grant)
+        end
+
+        should "return false when business is based in England but not in a qualifying sector" do
+          @calculator.business_based = "england"
+          assert_not @calculator.show?(:restart_grant)
+        end
+      end
+
+      context "council_grants" do
+        should "return true for one of the council grant rules" do
+          # meeting criteria for additional_restrictions_grant
+          @calculator.business_based = "england"
+          assert @calculator.show?(:council_grants)
+        end
+
+        should "return false for other rules" do
+          assert_not @calculator.show?(:council_grants)
+        end
+      end
     end
   end
 end