Expense option bug fix

.allow_skipping_tests

@@ -42,7 +42,6 @@ controllers/placement_reports_controller.rb
 controllers/reports_controller.rb
 controllers/supervisor_volunteers_controller.rb
 controllers/supervisors_controller.rb
-controllers/system_settings_controller.rb
 controllers/users/passwords_controller.rb
 controllers/users/sessions_controller.rb
 controllers/users_controller.rb

app/controllers/casa_org_controller.rb

@@ -46,6 +46,7 @@ def casa_org_update_params
       :logo,
       :court_report_template,
       :show_driving_reimbursement,
+      :additional_expenses_enabled,
       :twilio_account_sid,
       :twilio_phone_number,
       :twilio_api_key_sid,

app/controllers/case_contacts_controller.rb

@@ -102,7 +102,7 @@ def update
     @current_organization_groups = current_organization.contact_type_groups
 
     if @case_contact.update_cleaning_contact_types(update_case_contact_params)
-      if additional_expense_params&.any? && FeatureFlagService.is_enabled?(FeatureFlagService::SHOW_ADDITIONAL_EXPENSES_FLAG)
+      if additional_expense_params&.any? && policy(:case_contact).additional_expenses_allowed?
         update_or_create_additional_expense(additional_expense_params, @case_contact)
       end
       if @case_contact.valid?
@@ -156,7 +156,7 @@ def save_or_add_error(obj, case_contact)
 
   def create_case_contact_for_every_selected_casa_case(selected_cases)
     selected_cases.map do |casa_case|
-      if FeatureFlagService.is_enabled?(FeatureFlagService::SHOW_ADDITIONAL_EXPENSES_FLAG)
+      if policy(:case_contact).additional_expenses_allowed?
         new_cc = casa_case.case_contacts.new(create_case_contact_params.except(:casa_case_attributes))
         update_or_create_additional_expense(additional_expense_params, new_cc)
         if new_cc.valid?

app/models/casa_org.rb

@@ -117,21 +117,22 @@ def normalize_phone_number
 #
 # Table name: casa_orgs
 #
-#  id                         :bigint           not null, primary key
-#  address                    :string
-#  display_name               :string
-#  footer_links               :string           default([]), is an Array
-#  name                       :string           not null
-#  show_driving_reimbursement :boolean          default(TRUE)
-#  show_fund_request          :boolean          default(FALSE)
-#  slug                       :string
-#  twilio_account_sid         :string
-#  twilio_api_key_secret      :string
-#  twilio_api_key_sid         :string
-#  twilio_enabled             :boolean          default(FALSE)
-#  twilio_phone_number        :string
-#  created_at                 :datetime         not null
-#  updated_at                 :datetime         not null
+#  id                          :bigint           not null, primary key
+#  additional_expenses_enabled :boolean          default(FALSE)
+#  address                     :string
+#  display_name                :string
+#  footer_links                :string           default([]), is an Array
+#  name                        :string           not null
+#  show_driving_reimbursement  :boolean          default(TRUE)
+#  show_fund_request           :boolean          default(FALSE)
+#  slug                        :string
+#  twilio_account_sid          :string
+#  twilio_api_key_secret       :string
+#  twilio_api_key_sid          :string
+#  twilio_enabled              :boolean          default(FALSE)
+#  twilio_phone_number         :string
+#  created_at                  :datetime         not null
+#  updated_at                  :datetime         not null
 #
 # Indexes
 #

app/policies/application_policy.rb

@@ -142,6 +142,5 @@ def current_organization
   end
 
   alias_method :modify_organization?, :is_admin?
-  alias_method :edit_system_settings?, :is_admin?
   alias_method :see_import_page?, :is_admin?
 end

app/policies/case_contact_policy.rb

@@ -7,6 +7,11 @@ def is_creator_or_supervisor_or_casa_admin?
     is_creator? || admin_or_supervisor?
   end
 
+  def additional_expenses_allowed?
+    FeatureFlagService.is_enabled?(FeatureFlagService::SHOW_ADDITIONAL_EXPENSES_FLAG) &&
+      current_organization.additional_expenses_enabled
+  end
+
   alias_method :index?, :admin_or_supervisor_or_volunteer?
   alias_method :new?, :admin_or_supervisor_or_volunteer?
   alias_method :show?, :is_creator_or_casa_admin?

app/views/casa_org/edit.html.erb

@@ -54,6 +54,10 @@
       <%= form.check_box :show_driving_reimbursement, class: 'form-check-input' %>
       <%= form.label :show_driving_reimbursement, "Show driving reimbursement", class: 'form-check-label mb-2' %>
     </div>
+    <div class="form-check checkbox-style mb-20">
+      <%= form.check_box :additional_expenses_enabled, class: 'form-check-input' %>
+      <%= form.label :additional_expenses_enabled, "Volunteers can add Other Expenses", class: 'form-check-label mb-2' %>
+    </div>
     <div class="actions mb-10">
       <%= button_tag(
             type: "submit",

app/views/case_contacts/_form.html.erb

@@ -166,7 +166,7 @@ readonly: true %>
       </div>
     <% end %>
 
-    <% if FeatureFlagService.is_enabled?(FeatureFlagService::SHOW_ADDITIONAL_EXPENSES_FLAG) %>
+    <% if Pundit.policy(current_user, case_contact).additional_expenses_allowed? %>
       <div class="other-expenses">
         <h5 class="mb-3"><%= form.label :additional_expense, "d. Other Expenses" %></h5>
         <ol>

app/views/layouts/_sidebar.html.erb

@@ -142,15 +142,6 @@
               </li>
             <% end %>
 
-            <% if policy(:application).edit_system_settings? %>
-              <li>
-                <%= link_to settings_path, class: "#{active_class(settings_path)}" do %>
-                  <i class="lni lni-cog mr-10"></i>
-                  System Settings
-                <% end %>
-              </li>
-            <% end %>
-
             <% if policy(:application).see_mileage_rate? %>
               <li>
                 <%= link_to mileage_rates_path, class: "#{active_class(mileage_rates_path)}" do %>

config/routes.rb

@@ -87,7 +87,6 @@
       get :download_failed
     end
   end
-  resources :settings, only: %i[index create], controller: "system_settings"
   resources :case_contact_reports, only: %i[index]
   resources :mileage_reports, only: %i[index]
   resources :mileage_rates, only: %i[index new create edit update]

db/migrate/20230621161252_add_additional_expenses_to_casa_orgs.rb

@@ -0,0 +1,5 @@
+class AddAdditionalExpensesToCasaOrgs < ActiveRecord::Migration[7.0]
+  def change
+    add_column :casa_orgs, :additional_expenses_enabled, :boolean, default: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_06_15_155223) do
+ActiveRecord::Schema[7.0].define(version: 2023_06_21_161252) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -141,6 +141,7 @@
     t.string "twilio_api_key_sid"
     t.string "twilio_api_key_secret"
     t.boolean "twilio_enabled", default: false
+    t.boolean "additional_expenses_enabled", default: false
     t.index ["slug"], name: "index_casa_orgs_on_slug", unique: true
   end
 

spec/policies/application_policy_spec.rb

@@ -87,18 +87,4 @@
       end
     end
   end
-
-  permissions :edit_system_settings? do
-    it "does not allow volunters" do
-      is_expected.not_to permit(volunteer)
-    end
-
-    it "does not allow supervisors" do
-      is_expected.not_to permit(supervisor)
-    end
-
-    it "allow casa_admins for same org" do
-      is_expected.to permit(casa_admin)
-    end
-  end
 end

spec/requests/casa_org_spec.rb

@@ -25,7 +25,8 @@
         {
           name: "name", display_name: "display_name", address: "address",
           twilio_account_sid: "articuno34", twilio_api_key_sid: "Aladdin",
-          twilio_api_key_secret: "open sesame", twilio_phone_number: "+12223334444"
+          twilio_api_key_secret: "open sesame", twilio_phone_number: "+12223334444",
+          show_driving_reimbursement: "1", additional_expenses_enabled: "1"
         }
       end
 
@@ -41,6 +42,8 @@
         expect(casa_org.display_name).to eq "display_name"
         expect(casa_org.address).to eq "address"
         expect(casa_org.twilio_phone_number).to eq "+12223334444"
+        expect(casa_org.show_driving_reimbursement).to be true
+        expect(casa_org.additional_expenses_enabled).to be true
       end
 
       describe "on logo update" do

spec/requests/case_contacts_spec.rb

@@ -143,6 +143,7 @@
 
         before do
           FeatureFlagService.enable!(FeatureFlagService::SHOW_ADDITIONAL_EXPENSES_FLAG)
+          organization.additional_expenses_enabled = true
         end
 
         it "creates an additional expense with correct values", :aggregate_failures do

spec/system/casa_org/edit_spec.rb

@@ -125,6 +125,10 @@
     expect(page).to have_text("Twilio Phone Number")
   end
 
+  it "has option to enable additional expenses" do
+    expect(page).to have_text("Volunteers can add Other Expenses")
+  end
+
   it "requires name text field" do
     expect(page).to have_selector("input[required=required]", id: "casa_org_name")
   end