Merge branch 'master' into development

Dockerfile

@@ -2,12 +2,14 @@
 
 # to build for a development environment, run the following command:
 # docker build --build-arg build_env=dev -t coldfront --ssh default . --network=host
-
 FROM python:3.10
 
 ARG build_env=production
 ENV BUILD_ENV=$build_env
 
+LABEL org.opencontainers.image.source=https://github.com/fasrc/coldfront
+LABEL org.opencontainers.image.description="fasrc coldfront application"
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     && apt-get install -y redis redis-server \

coldfront/plugins/ifx/urls.py

@@ -1,7 +1,7 @@
 from django.urls import path, include
 from rest_framework import routers
 from ifxbilling.views import unauthorized as unauthorized_api
-from ifxbilling.views import get_orgs_with_billing, get_charge_history
+from ifxbilling import views as ifxbilling_views
 from ifxuser.views import get_org_names
 from coldfront.plugins.ifx.viewsets import ColdfrontBillingRecordViewSet, ColdfrontReportRunViewSet, ColdfrontProductUsageViewSet
 from coldfront.plugins.ifx.views import update_user_accounts_view, get_billing_record_list, unauthorized, report_runs, run_report, calculate_billing_month, billing_month, get_product_usages, billing_records, send_billing_record_review_notification, lab_billing_summary
@@ -14,9 +14,14 @@
 urlpatterns = [
     path('api/unauthorized/', unauthorized_api),
     path('api/billing/get-billing-record-list/', get_billing_record_list),
-    path('api/billing/get-orgs-with-billing/<str:invoice_prefix>/<int:year>/<int:month>/', get_orgs_with_billing),
-    path('api/billing/get-charge-history/', get_charge_history),
-    path('api/calculate-billing-month/<int:year>/<int:month>/', calculate_billing_month),
+    path('api/billing/get-orgs-with-billing/<str:invoice_prefix>/<int:year>/<int:month>/', ifxbilling_views.get_orgs_with_billing),
+    path('api/billing/get-charge-history/', ifxbilling_views.get_charge_history),
+    path('api/billing/get-summary-by-user/', ifxbilling_views.get_summary_by_user),
+    path('api/billing/get-summary-by-product-rate/', ifxbilling_views.get_summary_by_product_rate),
+    path('api/billing/get-summary-by-account/', ifxbilling_views.get_summary_by_account),
+    path('api/billing/get-pending-year-month/<str:invoice_prefix>/', ifxbilling_views.get_pending_year_month),
+    path('api/billing/rebalance/', ifxbilling_views.rebalance),
+    path('api/calculate-billing-month/<int:year>/<int:month>/', calculate_billing_month, name='calculate-billing-month'),
     path('api/run-report/', run_report),
     path('api/get-org-names/', get_org_names, name='get-org-names'),
     path('api/get-product-usages/', get_product_usages, name='get-product-usages'),