Merge pull request dimagi#986 from dimagi/cs/CI-501-remove-switch

Remove "automated_invoice" feature switch

Author: Charl1996

commcare_connect/flags/switch_names.py

@@ -1,6 +1,5 @@
 OPPORTUNITY_CREDENTIALS = "opportunity_credentials"
 USER_VISIT_FILTERS = "user_visit_filters"
-AUTOMATED_INVOICES = "automated_invoices"
 INVOICE_REVIEW = "invoice_review"
 AUTOMATED_INVOICES_MONTHLY = "automated_invoices_monthly"
 API_UUID = "api_uuid"

commcare_connect/opportunity/forms.py

@@ -1454,134 +1454,6 @@ def __init__(self, *args, **kwargs):
         )
 
 
-class PaymentInvoiceForm(forms.ModelForm):
-    usd_currency = forms.BooleanField(
-        required=False,
-        initial=False,
-        label=_("Specify in USD"),
-        widget=forms.CheckboxInput(),
-    )
-
-    class Meta:
-        model = PaymentInvoice
-        fields = ("amount", "date", "invoice_number", "service_delivery")
-        widgets = {
-            "date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
-            "amount": forms.NumberInput(attrs={"min": "0"}),
-        }
-
-    def __init__(self, *args, **kwargs):
-        self.opportunity = kwargs.pop("opportunity")
-        self.invoice_type = kwargs.pop("invoice_type", PaymentInvoice.InvoiceType.service_delivery)
-        self.read_only = kwargs.pop("read_only", False)
-        self.status = kwargs.pop("status", InvoiceStatus.PENDING)
-        super().__init__(*args, **kwargs)
-        if self.read_only:
-            self.fields["status"] = forms.CharField(required=False, label=gettext("Invoice Status"))
-            for field in self.fields.values():
-                field.widget.attrs["readonly"] = "readonly"
-
-        if self.instance.pk:
-            self.status = self.instance.status
-            self.fields["status"].initial = self.instance.get_status_display()
-
-        self.fields["usd_currency"].widget.attrs.update(
-            {
-                "x-ref": "currencyToggle",
-                "x-on:change": "currency = $event.target.checked; convert(true)",
-            }
-        )
-
-        currency_code = self.opportunity.currency_code
-
-        self.helper = FormHelper(self)
-        layout_fields = [
-            Row(
-                Field(
-                    "date",
-                    **{
-                        "x-ref": "date",
-                        "x-on:change": "convert()",
-                    },
-                ),
-                Field(
-                    "amount",
-                    label=f"Amount ({currency_code})" if currency_code else "Amount",
-                    **{
-                        "x-ref": "amount",
-                        "x-on:input.debounce.300ms": "convert()",
-                    },
-                ),
-                Div(css_id="converted-amount-wrapper", css_class="space-y-1 text-sm text-gray-500 mb-4"),
-                Field("invoice_number"),
-                Field("status"),
-                Field(
-                    "usd_currency",
-                    css_class=CHECKBOX_CLASS,
-                    wrapper_class="flex p-4 justify-between rounded-lg bg-gray-100",
-                ),
-                css_class="flex flex-col",
-            ),
-        ]
-
-        if not self.read_only:
-            layout_fields.append(
-                Div(
-                    Submit("submit", "Submit", css_class="button button-md primary-dark"),
-                    css_class="flex justify-end mt-4",
-                )
-            )
-
-        self.helper.layout = Layout(*layout_fields)
-        self.helper.form_tag = False
-
-    def clean_invoice_number(self):
-        invoice_number = self.cleaned_data["invoice_number"]
-        if PaymentInvoice.objects.filter(opportunity=self.opportunity, invoice_number=invoice_number).exists():
-            raise ValidationError(
-                f'Invoice "{invoice_number}" already exists',
-                code="invoice_number_reused",
-            )
-        return invoice_number
-
-    def clean(self):
-        cleaned_data = super().clean()
-        amount = cleaned_data.get("amount")
-        usd_currency = cleaned_data.get("usd_currency")
-        date = cleaned_data.get("date")
-
-        if amount is None or date is None:
-            return cleaned_data  # Let individual field errors handle missing values
-
-        currency = getattr(self.opportunity, "currency", None)
-        exchange_rate = ExchangeRate.latest_exchange_rate(currency.code if currency else None, date)
-        if not exchange_rate:
-            raise ValidationError("Exchange rate not available for selected date.")
-
-        cleaned_data["exchange_rate"] = exchange_rate
-
-        if usd_currency:
-            cleaned_data["amount_usd"] = amount
-            cleaned_data["amount"] = round(amount * exchange_rate.rate, 2)
-        else:
-            cleaned_data["amount"] = amount
-            cleaned_data["amount_usd"] = round(amount / exchange_rate.rate, 2)
-
-        return cleaned_data
-
-    def save(self, commit=True):
-        instance = super().save(commit=False)
-        instance.opportunity = self.opportunity
-        instance.amount_usd = self.cleaned_data["amount_usd"]
-        instance.exchange_rate = self.cleaned_data["exchange_rate"]
-        instance.service_delivery = self.invoice_type == PaymentInvoice.InvoiceType.service_delivery
-        instance.status = self.status
-
-        if commit:
-            instance.save()
-        return instance
-
-
 class AutomatedPaymentInvoiceForm(forms.ModelForm):
     amount = forms.DecimalField(
         label=_("Amount"),

commcare_connect/opportunity/tests/test_views.py

@@ -13,13 +13,8 @@
 from waffle.testutils import override_switch
 
 from commcare_connect.connect_id_client.models import ConnectIdUser
-from commcare_connect.flags.switch_names import AUTOMATED_INVOICES, INVOICE_REVIEW
-from commcare_connect.opportunity.forms import (
-    AddBudgetExistingUsersForm,
-    AutomatedPaymentInvoiceForm,
-    PaymentInvoiceForm,
-    PaymentUnitForm,
-)
+from commcare_connect.flags.switch_names import INVOICE_REVIEW
+from commcare_connect.opportunity.forms import AddBudgetExistingUsersForm, AutomatedPaymentInvoiceForm, PaymentUnitForm
 from commcare_connect.opportunity.helpers import OpportunityData, TieredQueryset
 from commcare_connect.opportunity.models import (
     Opportunity,
@@ -1195,13 +1190,8 @@ def assert_readonly_form(response):
                 else:
                     assert field.widget.attrs.get("readonly") == "readonly", f"Field {field_name} should be readonly"
 
-        with override_switch(AUTOMATED_INVOICES, active=True):
-            response = client.get(url)
-            assert_readonly_form(response)
-
-        with override_switch(AUTOMATED_INVOICES, active=False):
-            response = client.get(url)
-            assert_readonly_form(response)
+        response = client.get(url)
+        assert_readonly_form(response)
 
     @override_switch(INVOICE_REVIEW, active=True)
     def test_custom_invoice_no_line_items(self, client, setup_invoice):
@@ -1215,16 +1205,15 @@ def test_custom_invoice_no_line_items(self, client, setup_invoice):
             date=date(2025, 11, 1),
         )
 
-        with override_switch(AUTOMATED_INVOICES, active=True):
-            client.force_login(user)
-            url = reverse(
-                "opportunity:invoice_review",
-                args=(opportunity.organization.slug, opportunity.opportunity_id, custom_invoice.payment_invoice_id),
-            )
-            response = client.get(url)
+        client.force_login(user)
+        url = reverse(
+            "opportunity:invoice_review",
+            args=(opportunity.organization.slug, opportunity.opportunity_id, custom_invoice.payment_invoice_id),
+        )
+        response = client.get(url)
 
-            form = response.context["form"]
-            assert form.line_items_table is None
+        form = response.context["form"]
+        assert form.line_items_table is None
 
     @override_switch(INVOICE_REVIEW, active=True)
     def test_unauthorized_user_cannot_access(self, client, setup_invoice):
@@ -1242,37 +1231,20 @@ def test_unauthorized_user_cannot_access(self, client, setup_invoice):
         # Should redirect (permission denied) or return 403/404
         assert response.status_code in [302, 403, 404]
 
-    @override_switch(INVOICE_REVIEW, active=True)
-    def test_legacy_form_when_switch_inactive(self, client, setup_invoice):
-        invoice = setup_invoice["invoice"]
-        opportunity = setup_invoice["opportunity"]
-        user = setup_invoice["user"]
-
-        with override_switch(AUTOMATED_INVOICES, active=False):
-            client.force_login(user)
-            url = reverse(
-                "opportunity:invoice_review",
-                args=(opportunity.organization.slug, opportunity.opportunity_id, invoice.payment_invoice_id),
-            )
-            response = client.get(url)
-            form = response.context["form"]
-            assert isinstance(form, PaymentInvoiceForm)
-
     @override_switch(INVOICE_REVIEW, active=True)
     def test_automated_form_when_switch_active(self, client, setup_invoice):
         invoice = setup_invoice["invoice"]
         opportunity = setup_invoice["opportunity"]
         user = setup_invoice["user"]
 
-        with override_switch(AUTOMATED_INVOICES, active=True):
-            client.force_login(user)
-            url = reverse(
-                "opportunity:invoice_review",
-                args=(opportunity.organization.slug, opportunity.opportunity_id, invoice.payment_invoice_id),
-            )
-            response = client.get(url)
-            form = response.context["form"]
-            assert isinstance(form, AutomatedPaymentInvoiceForm)
+        client.force_login(user)
+        url = reverse(
+            "opportunity:invoice_review",
+            args=(opportunity.organization.slug, opportunity.opportunity_id, invoice.payment_invoice_id),
+        )
+        response = client.get(url)
+        form = response.context["form"]
+        assert isinstance(form, AutomatedPaymentInvoiceForm)
 
 
 @pytest.mark.django_db

commcare_connect/opportunity/views.py

@@ -54,7 +54,7 @@
 from waffle import switch_is_active
 
 from commcare_connect.connect_id_client import fetch_users
-from commcare_connect.flags.switch_names import AUTOMATED_INVOICES, INVOICE_REVIEW, USER_VISIT_FILTERS
+from commcare_connect.flags.switch_names import INVOICE_REVIEW, USER_VISIT_FILTERS
 from commcare_connect.form_receiver.serializers import XFormSerializer
 from commcare_connect.opportunity.api.serializers import remove_opportunity_access_cache
 from commcare_connect.opportunity.app_xml import AppNoBuildException
@@ -78,7 +78,6 @@
     OpportunityUserInviteForm,
     OpportunityVerificationFlagsConfigForm,
     PaymentExportForm,
-    PaymentInvoiceForm,
     PaymentUnitForm,
     SendMessageMobileUsersForm,
     VisitExportForm,
@@ -1425,6 +1424,7 @@ def invoice_list(request, org_slug, opp_id):
 class InvoiceCreateView(OrganizationUserMixin, OpportunityObjectMixin, CreateView):
     model = PaymentInvoice
     template_name = "opportunity/invoice_create.html"
+    form_class = AutomatedPaymentInvoiceForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -1455,12 +1455,6 @@ def get_context_data(self, **kwargs):
         )
         return context
 
-    @property
-    def form_class(self):
-        if waffle.switch_is_active(AUTOMATED_INVOICES):
-            return AutomatedPaymentInvoiceForm
-        return PaymentInvoiceForm
-
     @property
     def breadcrumb_title(self):
         service_delivery = PaymentInvoice.InvoiceType.service_delivery
@@ -1485,8 +1479,7 @@ def get_form_kwargs(self):
         kwargs["opportunity"] = self.get_opportunity()
         kwargs["invoice_type"] = self.request.GET.get("invoice_type", PaymentInvoice.InvoiceType.service_delivery)
         kwargs["status"] = InvoiceStatus.SUBMITTED
-        if waffle.switch_is_active(AUTOMATED_INVOICES):
-            kwargs["is_opportunity_pm"] = self.request.is_opportunity_pm
+        kwargs["is_opportunity_pm"] = self.request.is_opportunity_pm
         return kwargs
 
     def get_success_url(self):
@@ -1549,14 +1542,6 @@ def get_form(self):
             else PaymentInvoice.InvoiceType.custom
         )
 
-        if not waffle.switch_is_active(AUTOMATED_INVOICES):
-            return PaymentInvoiceForm(
-                instance=invoice,
-                opportunity=opportunity,
-                invoice_type=invoice_type,
-                read_only=True,
-            )
-
         line_items_table = None
         if invoice.service_delivery:
             completed_works = get_invoiced_visit_items(invoice)