Merge pull request #7988 from jibees/7919-add-enterprise-fees-validation

Enterprise fee must be linked with an enterprise: add validations

app/models/enterprise_fee.rb

@@ -21,6 +21,7 @@ class EnterpriseFee < ApplicationRecord
 
   validates :fee_type, inclusion: { in: FEE_TYPES }
   validates :name, presence: true
+  validates :enterprise_id, presence: true
 
   before_save :ensure_valid_tax_category_settings
 

app/views/admin/enterprise_fees/index.html.haml

@@ -29,7 +29,7 @@
         %tr{ ng: { repeat: 'enterprise_fee in enterprise_fees | filter:query' } }
           %td
             = f.ng_hidden_field :id
-            %ofn-select{ :id => angular_id(:enterprise_id), data: 'enterprises', include_blank: true, ng: { model: 'enterprise_fee.enterprise_id' } }
+            %ofn-select{ :id => angular_id(:enterprise_id), data: 'enterprises', ng: { model: 'enterprise_fee.enterprise_id' } }
             %input{ type: "hidden", name: angular_name(:enterprise_id), ng: { value: "enterprise_fee.enterprise_id" } }
           %td= f.ng_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.ng_text_field :name, { placeholder: t('.name_placeholder') }

spec/features/admin/enterprise_fees_spec.rb

@@ -181,7 +181,7 @@ feature '
       click_link "Manage Enterprise Fees"
       expect(page).to have_select('sets_enterprise_fee_set_collection_attributes_0_enterprise_id',
                                   selected: 'Second Distributor',
-                                  options: ['', 'First Distributor', 'Second Distributor'])
+                                  options: ['First Distributor', 'Second Distributor'])
     end
   end
 end