Do not change issuing_date on finalization if keep_anchor is set

Author: vankiru

app/services/invoices/provider_taxes/pull_taxes_and_apply_service.rb

@@ -115,7 +115,17 @@ def create_applied_prepaid_credit
       end
 
       def issuing_date
-        @issuing_date ||= Time.current.in_time_zone(customer.applicable_timezone).to_date
+        @issuing_date ||=
+          if issuing_date_keep_anchor?
+            invoice.issuing_date
+          else
+            Time.current.in_time_zone(customer.applicable_timezone).to_date
+          end
+      end
+
+      def issuing_date_keep_anchor?
+        invoice.invoice_subscriptions.first&.recurring? &&
+          customer.applicable_subscription_invoice_issuing_date_adjustment == "keep_anchor"
       end
 
       def payment_due_date

app/services/invoices/refresh_draft_and_finalize_service.rb

@@ -17,6 +17,10 @@ def call
         invoice.issuing_date = issuing_date
         refresh_result = Invoices::RefreshDraftService.call(invoice:, context: :finalize)
         if invoice.tax_pending?
+          # When we need to fetch taxes, the invoice isn't finalized until taxes are pulled.
+          # So we can't show the final issuing/payment due dates yet.
+          # We'll set those in Inovoices::ProviderTaxes::PullTaxesAndApplyService
+          # once the taxes are successfully pulled.
           invoice.update!(issuing_date: drafted_issuing_date)
           # rubocop:disable Rails/TransactionExitStatement
           return refresh_result
@@ -60,7 +64,17 @@ def call
     attr_accessor :invoice, :result
 
     def issuing_date
-      @issuing_date ||= Time.current.in_time_zone(invoice.customer.applicable_timezone).to_date
+      @issuing_date ||=
+        if issuing_date_keep_anchor?
+          invoice.issuing_date
+        else
+          Time.current.in_time_zone(invoice.customer.applicable_timezone).to_date
+        end
+    end
+
+    def issuing_date_keep_anchor?
+      invoice.invoice_subscriptions.first&.recurring? &&
+        invoice.customer.applicable_subscription_invoice_issuing_date_adjustment == "keep_anchor"
     end
 
     def payment_due_date

db/structure.sql

@@ -10653,10 +10653,10 @@ ALTER TABLE ONLY public.wallet_transactions_invoice_custom_sections
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
-('20251201084648'),
 ('20251204142205'),
 ('20251202141759'),
 ('20251201094057'),
+('20251201084648'),
 ('20251128102055'),
 ('20251127145819'),
 ('20251127123135'),

spec/services/invoices/provider_taxes/pull_taxes_and_apply_service_spec.rb

@@ -152,15 +152,50 @@
           .to change(invoice.error_details.tax_error, :count).from(1).to(0)
       end
 
-      it "updates the issuing date and payment due date" do
-        invoice.customer.update(timezone: "America/New_York")
+      context "with a non-recurring invoice" do
+        let(:billing_entity) { create(:billing_entity, organization:, subscription_invoice_issuing_date_adjustment: "keep_anchor") }
 
-        freeze_time do
-          current_date = Time.current.in_time_zone("America/New_York").to_date
+        it "updates the issuing date and payment due date" do
+          invoice.customer.update(timezone: "America/New_York")
 
-          expect { pull_taxes_service.call }
-            .to change { invoice.reload.issuing_date }.to(current_date)
-            .and change { invoice.reload.payment_due_date }.to(current_date)
+          freeze_time do
+            current_date = Time.current.in_time_zone("America/New_York").to_date
+
+            expect { pull_taxes_service.call }
+              .to change { invoice.reload.issuing_date }.to(current_date)
+              .and change { invoice.reload.payment_due_date }.to(current_date)
+          end
+        end
+      end
+
+      context "with a recurring invoice" do
+        let(:billing_entity) { create(:billing_entity, organization:, subscription_invoice_issuing_date_adjustment:) }
+
+        before do
+          invoice.invoice_subscriptions.first.update(recurring: true)
+          invoice.customer.update(timezone: "America/New_York")
+        end
+
+        context "with issuing date adjustment set to keep_anchor" do
+          let(:subscription_invoice_issuing_date_adjustment) { "keep_anchor" }
+
+          it "does not update the issuing date" do
+            expect { pull_taxes_service.call }.not_to change { invoice.reload.issuing_date }
+          end
+        end
+
+        context "with issuing date adjustment set to align_with_finalization_date" do
+          let(:subscription_invoice_issuing_date_adjustment) { "align_with_finalization_date" }
+
+          it "updates the issuing date and payment due date" do
+            freeze_time do
+              current_date = Time.current.in_time_zone("America/New_York").to_date
+
+              expect { pull_taxes_service.call }
+                .to change { invoice.reload.issuing_date }.to(current_date)
+                .and change { invoice.reload.payment_due_date }.to(current_date)
+            end
+          end
         end
       end
 

spec/services/invoices/refresh_draft_and_finalize_service_spec.rb

@@ -89,15 +89,50 @@
       expect(Invoices::TransitionToFinalStatusService).to have_received(:call).with(invoice:)
     end
 
-    it "updates the issuing date" do
-      invoice.customer.update(timezone: "America/New_York")
+    context "with a non-recurring invoice" do
+      let(:billing_entity) { create(:billing_entity, organization:, subscription_invoice_issuing_date_adjustment: "keep_anchor") }
 
-      freeze_time do
-        current_date = Time.current.in_time_zone("America/New_York").to_date
+      it "updates the issuing date" do
+        invoice.customer.update(timezone: "America/New_York")
 
-        expect { finalize_service.call }
-          .to change { invoice.reload.issuing_date }.to(current_date)
-          .and change { invoice.reload.payment_due_date }.to(current_date)
+        freeze_time do
+          current_date = Time.current.in_time_zone("America/New_York").to_date
+
+          expect { finalize_service.call }
+            .to change { invoice.reload.issuing_date }.to(current_date)
+            .and change { invoice.reload.payment_due_date }.to(current_date)
+        end
+      end
+    end
+
+    context "with a recurring invoice" do
+      let(:billing_entity) { create(:billing_entity, organization:, subscription_invoice_issuing_date_adjustment:) }
+
+      before do
+        invoice.invoice_subscriptions.first.update(recurring: true)
+        invoice.customer.update(timezone: "America/New_York")
+      end
+
+      context "with issuing date adjustment set to keep_anchor" do
+        let(:subscription_invoice_issuing_date_adjustment) { "keep_anchor" }
+
+        it "does not update the issuing date" do
+          expect { finalize_service.call }.not_to change { invoice.reload.issuing_date }
+        end
+      end
+
+      context "with issuing date adjustment set to align_with_finalization_date" do
+        let(:subscription_invoice_issuing_date_adjustment) { "align_with_finalization_date" }
+
+        it "updates the issuing date" do
+          freeze_time do
+            current_date = Time.current.in_time_zone("America/New_York").to_date
+
+            expect { finalize_service.call }
+              .to change { invoice.reload.issuing_date }.to(current_date)
+              .and change { invoice.reload.payment_due_date }.to(current_date)
+          end
+        end
       end
     end