From 3c196c35059467b747fff015d47052eeb19d9d04 Mon Sep 17 00:00:00 2001
From: Leeza Baidar <leeza.baidar@gmeremit.com.np>
Date: Fri, 15 Dec 2023 17:11:08 +0545
Subject: [PATCH] #push Notification from admin

---
 .../PushNotification/ManageBroadCast.aspx     | 24 ++++++++++++-------
 .../PushNotification/ManageBroadCast.aspx.cs  |  2 +-
 .../ManageBroadCast.aspx.designer.cs          |  8 +++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
index e56c25c..faa5ba1 100644
--- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
+++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
@@ -28,19 +28,27 @@
 
     <script type="text/javascript">
         function CheckFormValidation() {
+            debugger;
+           
             var rowId = "<%=GetRowId()%>";
             var customerType = $("#ddlCustomerType").val();
-            if (customerType != "nativeCountry") {
-            var customerId = $('#txtSearchData_aValue').val();
-            if (customerId == null || customerId == "") {
-                alert('No customer selected. Please choose a customer to send broadcast message.');
-                var reqField = "DDLBroadCastType,TXTBody,";
-                if (ValidRequiredField(reqField) == false) {
-                    return false;
+            alert(customerType);
+            if (customerType == "All") {
+                return true;
+            }
+            else {
+                if (customerType != "nativeCountry") {
+                    var customerId = $('#txtSearchData_aValue').val();
+                    if (customerId == null || customerId == "") {
+                        alert('No customer selected. Please choose a customer to send broadcast message.');
+                        var reqField = "DDLBroadCastType,TXTBody,";
+                        if (ValidRequiredField(reqField) == false) {
+                            return false;
+                        }
+                    }
                 }
             }
         }
-        }
 
         function GetCustomerSearchType() {
             return $("#ddlCustomerType").val();
diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
index 92953e3..2557a92 100644
--- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
+++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
@@ -81,7 +81,7 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             var nativeCountry = ddlNativeCountry.SelectedValue;
          
 
-            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry")
+            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry" && customerType.ToLower() != "all")
             {
                 GetStatic.AlertMessage(this, "Customer can not be empty!");
                 return null;
diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.designer.cs b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.designer.cs
index 8b0425b..32a60bf 100644
--- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.designer.cs
+++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.designer.cs
@@ -60,7 +60,15 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
         protected global::Swift.web.Component.AutoComplete.SwiftTextBox txtSearchData;
 
         /// <summary>
+        /// ddlNativeCountry control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlNativeCountry;
+
+        /// <summary>
         /// msgType control.
         /// </summary>
         /// <remarks>