Allow registering multiple InvoicedItemsProcessingService impls

Author: labkey-adam

wnprc_billing/src/org/labkey/wnprc_billing/WNPRC_BillingModule.java

@@ -31,17 +31,16 @@
 import org.labkey.api.query.DefaultSchema;
 import org.labkey.api.query.QuerySchema;
 import org.labkey.api.security.roles.RoleManager;
-import org.labkey.api.services.ServiceRegistry;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.wnprc_billing.dataentry.ChargesFormType;
 import org.labkey.wnprc_billing.dataentry.NonAnimalChargesFormType;
 import org.labkey.wnprc_billing.notification.WNPRCBillingNotificationProvider;
 import org.labkey.wnprc_billing.pipeline.BillingPipelineProvider;
 import org.labkey.wnprc_billing.pipeline.InvoicedItemsProcessingServiceImpl;
 import org.labkey.wnprc_billing.query.WNPRC_BillingUserSchema;
-import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;
 import org.labkey.wnprc_billing.security.permissions.EHRFinanceAdminPermission;
 import org.labkey.wnprc_billing.security.roles.EHRFinanceAdmin;
+import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -69,12 +68,6 @@ public String getName()
         return 22.000;
     }
 
-    @Override
-    public boolean hasScripts()
-    {
-        return true;
-    }
-
     @Override
     @NotNull
     protected Collection<WebPartFactory> createWebPartFactories()
@@ -86,7 +79,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
     protected void init()
     {
         addController(WNPRC_BillingController.NAME, WNPRC_BillingController.class);
-        ServiceRegistry.get().registerService(InvoicedItemsProcessingService.class, new InvoicedItemsProcessingServiceImpl());
+        InvoicedItemsProcessingService.register(this, new InvoicedItemsProcessingServiceImpl());
         BillingNotificationService.get().registerBillingNotificationProvider(WNPRCBillingNotificationProvider.get());
 
         registerRoles();
@@ -122,7 +115,7 @@ protected void registerSchemas()
             @Override
             public QuerySchema createSchema(final DefaultSchema schema, Module module)
             {
-                return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getInstance().getSchema());
+                return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getSchema());
             }
         });
     }