Merge branch 'main' into issue-304

pvvramakrishnarao234 · web-flow · commit c213f4f87ace · 2024-09-18T10:10:35.000+05:30
diff --git a/backend/api/invoices/recurring/generate_next_invoice_now.py b/backend/api/invoices/recurring/generate_next_invoice_now.py
@@ -48,7 +48,13 @@ def generate_next_invoice_now_endpoint(request: WebRequest, invoice_profile_id):
         )
 
         return render(
-            request, "pages/invoices/recurring/manage/next_invoice_block.html", {"invoiceProfile": invoice_recurring_profile} | context
+            request,
+            "pages/invoices/recurring/manage/next_invoice_block.html",
+            {
+                "invoiceProfile": invoice_recurring_profile,
+                "swap": True,
+            }
+            | context,
         )
     else:
         logger.info(svc_resp.error)
diff --git a/frontend/templates/pages/invoices/recurring/manage/next_invoice_block.html b/frontend/templates/pages/invoices/recurring/manage/next_invoice_block.html
@@ -1,5 +1,5 @@
 <div data-oob="next_invoice_block"
-     hx-swap-oob='outerHTML:div[data-oob="next_invoice_block"]'
+     {% if swap %}hx-swap-oob='outerHTML:div[data-oob="next_invoice_block"]'{% endif %}
      class="card bg-base-100 shadow-xl w-full p-10 flex-row gap-x-4 mt-4">
     <div class="card-body p-0">
         <h1 class="text-2xl font-bold">Next Invoice</h1>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,13 @@ def generate_next_invoice_now_endpoint(request: WebRequest, invoice_profile_id):`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`return render(`
`51`		`- request, "pages/invoices/recurring/manage/next_invoice_block.html", {"invoiceProfile": invoice_recurring_profile} \| context`
	`51`	`+ request,`
	`52`	`+ "pages/invoices/recurring/manage/next_invoice_block.html",`
	`53`	`+ {`
	`54`	`+ "invoiceProfile": invoice_recurring_profile,`
	`55`	`+ "swap": True,`
	`56`	`+ }`
	`57`	`+ \| context,`
`52`	`58`	`)`
`53`	`59`	`else:`
`54`	`60`	`logger.info(svc_resp.error)`