From 2b67f85622b3326551c48e896d7a1bff631f3014 Mon Sep 17 00:00:00 2001
From: Leeza Baidar <leeza.baidar@gmeremit.com.np>
Date: Thu, 23 Nov 2023 12:31:30 +0545
Subject: [PATCH] #changes for txn report color code and payment option

---
 Business/Mobile/MobileServices.cs       | 9 +++++++--
 Common/Model/RewardFee.cs               | 6 +-----
 Repository/Mobile/MobileServicesRepo.cs | 9 ++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Business/Mobile/MobileServices.cs b/Business/Mobile/MobileServices.cs
index 50d5727..373c9de 100644
--- a/Business/Mobile/MobileServices.cs
+++ b/Business/Mobile/MobileServices.cs
@@ -2108,7 +2108,7 @@ namespace Business.Mobile
                             {
                                 ProviderId = "onewaysms",
                                 MobileNumber = mobileNo,
-                                SMSBody = s.ToString(),
+                                SMSBody = s.ToString(), 
                                 ProcessId = ProcessId.Substring(ProcessId.Length - 40, 40),
                                 RequestedBy = pwdReset.Username,
                                 UserName = pwdReset.Username,
@@ -3030,15 +3030,20 @@ namespace Business.Mobile
                 var jsonS = reader.ReadToEnd();
                 options = JsonConvert.DeserializeObject<List<Option>>(jsonS);
             }
+
+            List<Option> matchingOptions = new List<Option>();
+
             foreach (var paymentMethod in paymentMethods)
             {
                 var matchingOption = options.FirstOrDefault(option => option.Code == paymentMethod.Key);
                 if (matchingOption != null)
                 {
                     matchingOption.Value = paymentMethod.Value;
+                    matchingOptions.Add(matchingOption);
                 }
             }
-            return options;
+
+            return matchingOptions;
         }
         public JsonRxResponse ValidateReferralCode(string referralCode)
         {
diff --git a/Common/Model/RewardFee.cs b/Common/Model/RewardFee.cs
index b283723..fbc7004 100644
--- a/Common/Model/RewardFee.cs
+++ b/Common/Model/RewardFee.cs
@@ -41,9 +41,5 @@ namespace Common.Model
         public string RedirectURL { get; set; }
         public string CheckSuccessURL { get; set; }
         public string CheckFailURL { get; set; }
-    }
-        public string CheckSuccessURL { get; set; }
-
-        public string CheckFailURL { get; set; }
-    }
+    }  
 }
diff --git a/Repository/Mobile/MobileServicesRepo.cs b/Repository/Mobile/MobileServicesRepo.cs
index 62b1fc9..479f7f7 100644
--- a/Repository/Mobile/MobileServicesRepo.cs
+++ b/Repository/Mobile/MobileServicesRepo.cs
@@ -1710,15 +1710,14 @@ namespace Repository.Mobile
             }
             else if (status.Equals("PAID"))
             {
-                return "#008000";
+                return "#2ED636";
             }
             else if (status.Equals("CANCELLED"))
             {
-                return "#FF0000";
+                return "#F60909";
             }
             else
                 return "#514e82";
-
         }
 
         private string GetTextCode(string status)
@@ -1733,11 +1732,11 @@ namespace Repository.Mobile
             }
             else if (status.Equals("PAID"))
             {
-                return "#262262";
+                return "#000000";
             }
             else if (status.Equals("CANCELLED"))
             {
-                return "#262262";
+                return "#000000";
             }
             else
                 return "#FFFFFF";