From 3d67c94a9764a05414a35aa0c5dc28742bb241eb Mon Sep 17 00:00:00 2001
From: Malay Awasthi <malay.awasthi@juspay.in>
Date: Mon, 21 Oct 2024 17:18:04 +0530
Subject: [PATCH 1/2] fix/mandates

---
 .../router/src/core/payments/operations/payment_response.rs  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs
index 3bb6647b527..9a5379f206d 100644
--- a/crates/router/src/core/payments/operations/payment_response.rs
+++ b/crates/router/src/core/payments/operations/payment_response.rs
@@ -1556,8 +1556,9 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
                                 } else {
                                     None
                                 };
-
-                            if router_data.status == enums::AttemptStatus::Charged {
+                            if router_data.status == enums::AttemptStatus::Charged
+                                || router_data.status == enums::AttemptStatus::Authorized
+                            {
                                 payment_data
                                     .payment_intent
                                     .fingerprint_id

From e8c2c1c791fa93746001a84aba64553ef0a5901c Mon Sep 17 00:00:00 2001
From: Malay Awasthi <malay.awasthi@juspay.in>
Date: Mon, 21 Oct 2024 18:38:17 +0530
Subject: [PATCH 2/2] fix/mandates

---
 .../src/core/payments/operations/payment_response.rs      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs
index 9a5379f206d..274b4f43c5d 100644
--- a/crates/router/src/core/payments/operations/payment_response.rs
+++ b/crates/router/src/core/payments/operations/payment_response.rs
@@ -1556,9 +1556,11 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
                                 } else {
                                     None
                                 };
-                            if router_data.status == enums::AttemptStatus::Charged
-                                || router_data.status == enums::AttemptStatus::Authorized
-                            {
+                            // update connector_mandate_details in case of Authorized/Charged Payment Status
+                            if matches!(
+                                router_data.status,
+                                enums::AttemptStatus::Charged | enums::AttemptStatus::Authorized
+                            ) {
                                 payment_data
                                     .payment_intent
                                     .fingerprint_id