Customer SOA, Complinance highlight in REd, TXN Number in TXN Report

Swift.API/Common/Enum/Notification.cs

@@ -37,6 +37,8 @@ namespace Swift.API.Common.Enum
         [Description("Email to customer for OTP")]
         OTP_EMAIL = 8,
         
+        [Description("Customer Password and Txn Pin")]
+        PIN_PASSWORD_EMAIL = 20,
         FORCE_PASSWORD_CHANGE=9,
 
         TRANSACTION_APPROVED = 10,

Swift.DAL/Remittance/Transaction/ApproveTransactionDao.cs

@@ -856,5 +856,13 @@ namespace Swift.DAL.BL.Remit.Transaction
 
             return ExecuteDataTable(sql);
         }
+        public DbResult UpdateSyncTxnById(string user, string id)
+        {
+            var sql = "EXEC PROC_TP_TXN_PUSH @flag =  'INSTANT-PAID_V2'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @TRAN_ID = " + FilterString(id);
+            var drDb = ParseDbResult(sql);
+            return drDb;
+        }
     }
 }

Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs

@@ -1,6 +1,9 @@
 using Newtonsoft.Json;
+using Swift.API.Common;
+using Swift.API.Common.Enum;
 using Swift.API.Common.SyncModel;
 using Swift.API.ThirdPartyApiServices;
+using Swift.API.TPAPIs;
 using Swift.DAL.BL.System.Utility;
 using Swift.DAL.OnlineAgent;
 using Swift.DAL.SwiftDAL;
@@ -363,6 +366,42 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
             if (dbResult.ErrorCode == "0")
             {
                 saveCustomerDocument(dbResult);
+                var customerDetails = _cd.GetRequiredCustomerDetails(dbResult.Id, GetStatic.GetUser());
+                string membershipId = Convert.ToString(customerDetails["membershipId"]);
+                string registrationDate = Convert.ToString(customerDetails["createdDate"]);
+                List<Mapping> bodyMappings = new List<Mapping>();
+                bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = customerModel.firstName });
+                bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = dbResult.Id });
+                bodyMappings.Add(new Mapping() { SValue = "UserId", SText = membershipId });
+                bodyMappings.Add(new Mapping() { SValue = "FirstName", SText = customerModel.firstName });
+                bodyMappings.Add(new Mapping() { SValue = "MiddleName", SText = customerModel.middleName });
+                bodyMappings.Add(new Mapping() { SValue = "LastName", SText = customerModel.lastName1 });
+                bodyMappings.Add(new Mapping() { SValue = "MobileNo", SText = customerModel.mobile });
+                bodyMappings.Add(new Mapping() { SValue = "Address", SText = customerModel.address });
+                bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = customerModel.email });
+                bodyMappings.Add(new Mapping() { SValue = "RegisteredDate", SText = registrationDate });
+                //bodyMappings.Add(new Mapping() { SValue = "Password", SText = customerModel.password });
+
+                SendNotificationRequestMobile request = new SendNotificationRequestMobile()
+                {
+                    IsBulkNotification = false,
+                    UserName = customerModel.email,
+                    ProviderId = Guid.NewGuid().ToString(),
+                    NotificationTypeId = NOTIFICATION_TYPE.EMAIL.ToString(),
+                    Template = NotifyTemplate.BASIC_REGISTRATION_EMAIL,
+                    Recipients = new List<RecipientViewModel>()
+                            {
+                                new RecipientViewModel()
+                                    {
+                                            NotificationContent =  new NotificationDTO() {
+                                                Body = JsonConvert.SerializeObject(bodyMappings),
+                                                //Title will be set by mapping json
+                                            },
+                                             Address= customerModel.email
+                                    }
+                            }
+                };
+                JsonResponse jsonRes = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
 
                 string memberId = "";
                 if (dbResult.Msg.Split(':').Length > 1)

Swift.web/Component/Grid/SwiftGrid.cs

@@ -5,6 +5,7 @@ using Swift.web.Library;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -634,6 +635,13 @@ namespace Swift.web.Component.Grid
         public bool AllowRowDisable { get; set; }
         public String DisabledRowValueSourceField { get; set; }
 
+        private Boolean _downlodExcel = false;
+        [DefaultValue(false)]
+        public Boolean DownloadAll
+        {
+            get { return _downlodExcel; }
+            set { _downlodExcel = value; }
+        }
         #endregion Properties
 
         #region Public Methods
@@ -1258,6 +1266,15 @@ namespace Swift.web.Component.Grid
                 else
                     html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadGrid('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
             }
+            if (DownloadAll)
+            {
+                if (GridDS.RemittanceDB == GridDataSource)
+                {
+                    html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export ALL to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadExcelRemit('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
+                }
+                else
+                    html.AppendLine("&nbsp; <span class=\"tool btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title = 'Export ALL to Excel' style = 'cursor:pointer color:green' onclick = \"DownloadExcel('" + GetStatic.GetUrlRoot() + "','xls',0,'');\")'><i class=\"fa fa-file-excel-o\"></i></span>&nbsp;&nbsp;&nbsp;");
+            }
 
             if (EnablePdfDownload)
             {

Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs

@@ -1,4 +1,6 @@
-using Swift.API.Common.TrustDoc;
+using Swift.API.Common;
+using Swift.API.Common.Enum;
+using Swift.API.Common.TrustDoc;
 using Swift.API.TPAPIs;
 using Swift.DAL.OnlineAgent;
 using Swift.DAL.SwiftDAL;
@@ -438,8 +440,9 @@ namespace Swift.web.MobileRemit.Admin.Operation
             {
                 if (dbResult.ErrorCode == "0")
                 {
+                    var membershipId = txtMembershipId.Text;
                     saveCustomerDocument(dbResult);
-                    Approve(sender, e, createdFrom, verifyType, hdnValidatedCustomer.Value);
+                    Approve(sender, e, createdFrom, verifyType, hdnValidatedCustomer.Value, membershipId);
                 }
             }
             //GetStatic.SetMessage(dbResult.ErrorCode, dbResult.Msg);
@@ -473,18 +476,44 @@ namespace Swift.web.MobileRemit.Admin.Operation
             return errorCode;
         }
 
-        protected void Approve(object sender, EventArgs e, string createdFrom, string verifyType, string isValidatedCustomer)
+        protected void Approve(object sender, EventArgs e, string createdFrom, string verifyType, string isValidatedCustomer, string membershipId)
         {
             var verifyRemarks = Request.Form["verifyRemarks"];
             var ofacRemarks = Request.Form["remarksOFAC"];
             DataSet ds = new DataSet();
-            if (GetRequestFrom() == "agent")
+            if ((GetRequestFrom() == "agent") && (membershipId.StartsWith("CR") || membershipId.StartsWith("ONL")))
             {
                 ds = _cd.ApprovePending(GetCustomerId(), GetStatic.GetUser(), ofacRemarks);
             }
             else
             {
                 ds = _cd.ApprovePendingFromMobile(GetCustomerId(), GetStatic.GetUser(), createdFrom, verifyType, isValidatedCustomer, verifyRemarks, ofacRemarks);
+                DbResult res = _cd.ParseDbResult(ds.Tables[0]);
+                if (res.ErrorCode == "0")
+                {
+                    SendNotificationRequestMobile request = new SendNotificationRequestMobile()
+                    {
+                        IsBulkNotification = false,
+                        //UserName = dbResult.Id,
+                        ProcessId = Guid.NewGuid().ToString(),
+                        ProviderId = NotifyTemplate.NONE.ToString(),
+                        NotificationTypeId = NOTIFICATION_TYPE.PUSH_NOTIFICATION.ToString(),
+                        Template = NotifyTemplate.NONE,
+                        Recipients = new List<RecipientViewModel>()
+                           {
+                                new RecipientViewModel()
+                                    {
+                                            NotificationContent =  new NotificationDTO() {
+                                            Body = "Your KYC has been successfully completed. We are thankful that you selected IME London. Get rewards from us by referring your friend to the IME London App.",
+                                            Title = "KYC Completion",
+                                            },
+                                            Address= res.Extra,
+                                            DeviceType = res.Extra2
+                                    }
+                           }
+                    };
+                    JsonResponse dbResult1 = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.PUSH_NOTIFICATION);
+                }
             }
 
             DbResult dbRes = _cd.ParseDbResult(ds.Tables[0]);

Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx

@@ -28,9 +28,15 @@
 
     <script type="text/javascript">
         function CheckFormValidation() {
+            debugger;
             var rowId = "<%=GetRowId()%>";
 
             var customerType = $("#ddlCustomerType").val();
+            alert(customerType);
+            if (customerType == "All") {
+                return true;
+            }
+            else {
             if (customerType != "nativeCountry") {
 
                 var customerId = $('#txtSearchData_aValue').val();
@@ -43,6 +49,7 @@
                 }
             }
         }
+        }
 
         function GetCustomerSearchType() {
             return $("#ddlCustomerType").val();

Swift.web/Remit/Compliance/PartnerSyncList/PartnerSyncList.aspx

@@ -33,12 +33,20 @@
                 $('#hdnsyncBtn').click();
             }
         }
+        function updateClick(tranid) {
+            debugger
+            if (tranid != '') {
+                $('#hdnTranId').val(tranid);
+                $('#hdnUpdateBtn').click();
+            }
+        }
     </script>
 </head>
 <body>
     <form id="form1" runat="server">
         <asp:HiddenField ID="hdnTranId" runat="server" />
         <asp:Button ID="hdnsyncBtn" runat="server" OnClick="hdnsyncBtn_Click" Style="display: none" />
+        <asp:Button ID="hdnUpdateBtn" runat="server" Enabled="true" OnClick="hdnUpdateBtn_Click" Style="display: none" />
         <div class="page-wrapper">
             <div class="row">
                 <div class="col-sm-12">

Swift.web/Remit/Compliance/PartnerSyncList/PartnerSyncList.aspx.cs

@@ -73,7 +73,10 @@ namespace Swift.web.Remit.Compliance.PartnerSyncList
             _grid.IsGridWidthInPercent = true;
             _grid.AllowCustomLink = swiftLibrary.HasRight(GetFunctionIdByUserType(SyncFunctionIdAgent, SyncFunctionId));
             _grid.CustomLinkVariables = "id";
-            _grid.CustomLinkText = "<a onclick=\"syncClick('@id')\" class=\"btn btn-xs btn-success\" title=\"Sync\"><i class=\"fa fa-refresh\" aria-hidden=\"true\"></i></a>";
+           //_grid.CustomLinkText = "<a onclick=\"updateClick('@id')\" class=\"btn btn-xs btn-success\" title=\"Sync\"><i class=\"fa fa-refresh\" aria-hidden=\"true\"></i></a>";
+            //_grid.CustomLinkText = "<button onclick=\"updateClick('@id')\" class=\"btn btn-xs btn-primary ml-2\" title=\"Update\">Update</button>";
+            _grid.CustomLinkText = "&nbsp;<input type = 'button' class='btn btn-primary m-t-25' value='Update' onclick = \"updateClick('@id');\"  />";
+
             string sql = "EXEC [proc_GetAllTxnForPartnerSync] @flag = 's' ";
             _grid.SetComma();
 
@@ -115,5 +118,12 @@ namespace Swift.web.Remit.Compliance.PartnerSyncList
             var result = syncTxnSingleId(tranId);
             GetStatic.AlertMessage(Page, result.Msg);
         }
+
+        protected void hdnUpdateBtn_Click(object sender, EventArgs e)
+        {
+            string tranId = hdnTranId.Value;
+            var result = at.UpdateSyncTxnById(GetStatic.GetUser(), tranId);
+            GetStatic.AlertMessage(Page, result.Msg);
+        }
     }
 }

Swift.web/Remit/Compliance/PartnerSyncList/PartnerSyncList.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.Compliance.PartnerSyncList {
+namespace Swift.web.Remit.Compliance.PartnerSyncList
+{
 
 
-    public partial class PartnerSyncList {
+    public partial class PartnerSyncList
+    {
 
         /// <summary>
         /// Head1 control.
@@ -48,6 +50,15 @@ namespace Swift.web.Remit.Compliance.PartnerSyncList {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button hdnsyncBtn;
 
+        /// <summary>
+        /// hdnUpdateBtn 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.Button hdnUpdateBtn;
+
         /// <summary>
         /// rpt_grid control.
         /// </summary>

Swift.web/Remit/CustomerSOA/CustomerSoaReceipt.aspx

@@ -67,7 +67,7 @@
             font-weight: 600;
             padding: 0px;
             margin: 3px 0;
-            font-size: 16px;
+            font-size: 14px;
         }
 
         table {
@@ -194,6 +194,20 @@
         .holderDiv {
             margin-top: 5px;
         }
+        .auto-style1 {
+            height: 24px;
+        }
+        .auto-style2 {
+            height: 30px;
+        }
+        .auto-style3 {
+            width: 737px;
+        }
+        .auto-style4 {
+            float: left;
+            height: 68px;
+            width: 354px;
+        }
     </style>
 </head>
 <body>
@@ -206,16 +220,14 @@
                             <table width="100%;" border="0">
                                 <tbody>
                                     <tr>
-                                        <td width="70%;">
+                                        <td class="auto-style3">
                                             <div class="logo">
-                                                <img style="float: left;" width="190" src="/Images/jme.png">
+                                                <img src="../../Images/ime-london-logo.png" class="auto-style4" />
+<%--                                                <img style="float: left;" width="190" src="/Images/jme.png">--%>
                                             </div>
                                         </td>
-                                        <td width="30%;">
-                                            <h2><span class="info" style="float: left">Remittance History
-                                            <br />
-                                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                           利用履歴</span></h2>
+                                        <td width="20%;">
+                                            <h2><span class="info" style="text-align: right;">Remittance History</span></h2>
                                         </td>
                                     </tr>
                                 </tbody>
@@ -227,36 +239,35 @@
                             <table width="100%;">
                                 <tbody>
                                     <tr>
-                                        <td width="15%;" valign="top">
+                                        <td width="15%;" valign="top" class="auto-style2">
                                             <p style="margin-bottom: 5px; margin-top: 10px; font-size: 14px; float: left" class="tleft">
                                                 <strong>Period </strong>
                                             </p>
                                         </td>
 
-                                        <td width="50%;" valign="top">
+                                        <td width="50%;" valign="top" class="auto-style2">
                                             <p style="margin-bottom: 5px; margin-top: 10px; font-size: 14px; float: left" class="tleft">
-                                                :- <strong id="txtperiod" runat="server"></strong>
+                                                : <strong id="txtperiod" runat="server"></strong>
                                             </p>
                                         </td>
-                                        <td width="15%;" valign="top">
+                                        <td width="15%;" valign="top" class="auto-style2">
                                             <p style="margin-bottom: 5px; margin-top: 10px; text-align: left; font-size: 14px" class="tleft">
-                                                Print Date  
+                                                 <strong>Print Date </strong>  
                                             </p>
                                         </td>
-                                        <td width="20%;" valign="top">
+                                        <td width="20%;" valign="top" class="auto-style2">
                                             <p style="margin-bottom: 5px; margin-top: 10px; text-align: left; font-size: 14px" class="tleft">
-                                                :-
-                                            <label id="txtPrintDate" runat="server"></label>
+                                                : <strong id="txtPrintDate" runat="server"></strong>
                                             </p>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td width="15%" valign="top">
-                                            <label>Name 送金者名</label></td>
-                                        <td width="50%" valign="top"><span class="info">: <strong class="info"><strong id="txtName" runat="server"></strong></strong></span></td>
-                                        <td width="15%" valign="top">
+                                        <td width="15%" valign="top" class="auto-style1">
+                                            <label>Name</label></td>
+                                        <td width="50%" valign="top" class="auto-style1"><span class="info">: <strong class="info"><strong id="txtName" runat="server"></strong></strong></span></td>
+                                        <td width="15%" valign="top" class="auto-style1">
                                             <label>Customer Id</label></td>
-                                        <td width="20%" valign="top"><span class="info">: <strong class="info"><strong id="txtCustomerId" runat="server"></strong></strong></span></td>
+                                        <td width="20%" valign="top" class="auto-style1"><span class="info">: <strong class="info"><strong id="txtCustomerId" runat="server"></strong></strong></span></td>
                                     </tr>
                                 </tbody>
                             </table>
@@ -280,10 +291,10 @@
 
                                     <tr>
                                         <td width="15%" valign="top">
-                                            <label>Address 住所</label></td>
+                                            <label>Address</label></td>
                                         <td width="50%" valign="top" style="white-space: normal"><span class="info">: <strong class="info"><strong id="txtAddress" runat="server"></strong> </strong></span></td>
                                         <td width="15%" valign="top">
-                                            <label>Dob</label></td>
+                                            <label>DOB</label></td>
                                         <td width="30%" valign="top"><span class="info">: <strong class="info"><strong id="txtDob" runat="server"></strong></strong></span></td>
                                     </tr>
                                 </tbody>
@@ -295,31 +306,31 @@
                             <table class="page-content" cellspacing='0' cellpadding='0' border-spacing='0' style="width: 100%, border:0;">
                                 <thead>
                                     <tr class="headerClass" style="text-align: center">
-                                        <td>#</td>
+                                        <td>SN</td>
                                         <td>
                                             <span style="white-space: nowrap;">Date
                                                 <br>
-                                                処理日</span>
+                                                </span>
                                         </td>
                                         <td>
                                             <span style="white-space: nowrap">Receiver<br />
-                                                受取人名</span>
+                                                </span>
                                         </td>
                                         <td>
                                             <span style="white-space: nowrap">Purpose<br />
-                                                送金目的</span>
+                                                </span>
                                         </td>
                                         <td>
                                             <span style="white-space: nowrap">Transfer Amount<br />
-                                                送金額</span>
+                                                </span>
                                         </td>
                                         <td>
                                             <span style="white-space: nowrap">Exc. Rate<br />
-                                                適用相場</span>
+                                                </span>
                                         </td>
                                         <td>
                                             <span style="white-space: nowrap">Receive Amount<br />
-                                                現地受取金額</span>
+                                                </span>
                                         </td>
                                     </tr>
                                 </thead>
@@ -342,16 +353,16 @@
                 <section>
                     <div style="display: table; width: 100%; vertical-align: middle;">
                         <div style="display: table-cell; z-index: 1; float: left; text-align: left; width: 40%; position: relative">
-                            <p>ジャパンマネーエクスプレス株式会社 </p>
-                            <p>資金移動業関東財務局長第00006号 </p>
+                            <p>Registration No.: 6432399, FCA Registration No.: 576127 </p>
+                            <p>HMRC Registration No.: 12663526 </p>
                             <img style="display:none" width="50" src="/css/images/watermarkNew.png" style="position: absolute; height: 78px; width: 73px; right: 100px; z-index: -2; top: 0;" />
                         </div>
 
                         <div style="display: table-cell; float: left; text-align: right; width: 57%;">
-                            <p>〒169-0073東京都新宿区百人町一丁目10番7号 大森ビル4階 AB号室</p>
-                            <p>Room AB, Omori Building 4F, 1-10-7 Hyakunin-cho, Shinjuku-ku, Tokyo, 169-0073, Japan</p>
-                            <p>Tel: 03-5475-3913, Fax: 03-5475-3914</p>
-                            <p>E-mail: info@japanremit.com l URL: www.japanremit.com</p>
+                            <p>IME London (Subhida UK Ltd. Company)</p>
+                            <p>Pentax House South Hill Avenue, South Harrow, London, HA2 0DU</p>
+                            <p>Tel: +4402088660307, +4407984713677</p>
+                            <p>E-mail: info@imelondon.co.uk</p>
                         </div>
                         <div style="display: table-cell; float: left; text-align: right; width: 3%;">
                         </div>

Swift.web/Remit/CustomerSOA/CustomerSoaReceipt.aspx.cs

@@ -88,29 +88,31 @@ namespace Swift.web.Remit.CustomerSOA
             txtDob.InnerText = firstRow["sdob"].ToString();
             int sNo = 1;
             double totalAmt = 0;
+            double totalPayoutAmt = 0;
             foreach (DataRow dr in dt.Rows)
             {
                 totalAmt += Convert.ToDouble(dr["tAmt"].ToString());
+                totalPayoutAmt += Convert.ToDouble(dr["pAmt"].ToString());
                 DateTime date = DateTime.Parse(dr["approvedDate"].ToString());
                 string approvedDate = date.ToString("yyyy-MM-dd");
                 sb.AppendLine("<tr class=\"table-info\">");
-                sb.AppendLine("<td style=\"white-space:nowrap\">" + sNo + "</td>");
-                sb.AppendLine("<td style=\"white-space:nowrap\">" + approvedDate + "</td>");
-                sb.AppendLine("<td style=\"white-space:nowrap\">" + dr["receiverName"].ToString() + "</td>");
-                sb.AppendLine("<td style=\"white-space:nowrap\">生活費支援<br> (" + dr["purpose"].ToString() + ")</td>");
-                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap\">" + GetStatic.ShowDecimal(dr["tAmt"].ToString()) + "" + dr["collCurr"].ToString() + "</td>");
-                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap\">" + dr["exRate"].ToString() + "</td>");
-                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap\">" + GetStatic.ShowDecimal(dr["pAmt"].ToString()) + "  " + dr["payoutCurr"].ToString() + " </td>");
+                sb.AppendLine("<td style=\"white-space:nowrap; text-align: center;\">" + sNo + "</td>");
+                sb.AppendLine("<td style=\"white-space:nowrap; text-align: center;\">" + approvedDate + "</td>");
+                sb.AppendLine("<td style=\"white-space:nowrap; text-align: center;\">" + dr["receiverName"].ToString() + "</td>");
+                sb.AppendLine("<td style=\"white-space:nowrap; text-align: center;\"> (" + dr["purpose"].ToString() + ")</td>");
+                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap; text-align: center;\">" + GetStatic.ShowDecimal(dr["tAmt"].ToString()) + " " + dr["collCurr"].ToString() + "</td>");
+                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap; text-align: center;\">" + dr["exRate"].ToString() + "</td>");
+                sb.AppendLine("<td class=\"tright\" style=\"white-space:nowrap; text-align: center;\">" + GetStatic.ShowDecimal(dr["pAmt"].ToString()) + "  " + dr["payoutCurr"].ToString() + " </td>");
                 sb.AppendLine("</tr>");
                 sNo++;
             }
 
             sb.AppendLine("<tr>");
             sb.AppendLine("<td>&nbsp;</td>");
-            sb.AppendLine("<td colspan=\"3\" class=\"tright\">TOTAL</td>");
-            sb.AppendLine(" <td class=\"tright\">" + GetStatic.ShowDecimal(totalAmt.ToString()) + "</td>");
-            sb.AppendLine("<td>&nbsp;</td>");
+            sb.AppendLine("<td colspan=\"3\" style=\"text-align: center;\" class=\"tright\">TOTAL</td>");
+            sb.AppendLine(" <td style=\"text-align: center;\" class=\"tright\">" + GetStatic.ShowDecimal(totalAmt.ToString()) + " " + firstRow["collCurr"].ToString() + "</td>");
             sb.AppendLine("<td>&nbsp;</td>");
+            sb.AppendLine(" <td style=\"text-align: center;\" class=\"tright\">" + GetStatic.ShowDecimal(totalPayoutAmt.ToString()) + " " + firstRow["payoutCurr"].ToString() + "</td>");
             return sb.ToString();
         }
     }

Swift.web/Remit/CustomerSOA/List.aspx

@@ -177,7 +177,7 @@
                                             <label class="control-label">
                                                 &nbsp;</label><br />
                                             <asp:Button ID="searchButton" Text="Search" class="btn btn-primary" runat="server" OnClick="searchButton_Click" />
-                                            <input name="button3" type="button" id="btnAdvSearch" onclick="PickSenderData('a');" class="btn btn-primary" value="Advance Search" />
+                                            <input name="button3" type="button" id="btnAdvSearch" onclick="PickSenderData('a');" class="btn btn-primary" style="display:none;" value="Advance Search" />
                                             <input name="button4" type="button" id="btnClear" value="Clear List" class="btn btn-primary" onclick="ClearAllCustomerInfo();" />
                                         </div>
                                     </div>

Swift.web/Remit/CustomerSOA/List.aspx.cs

@@ -124,7 +124,7 @@ namespace Swift.web.Remit.CustomerSOA
             _grid.ColumnList = new List<GridColumn>
                                   {
                                       new GridColumn("ID", "Transaction Id", "", "T"),
-                                      new GridColumn("controlNo", "JME No", "", "T"),
+                                      new GridColumn("controlNo", "IME No", "", "T"),
                                       new GridColumn("senderName", "Sender Name", "", "T"),
                                       new GridColumn("receiverName", "ReceiverName", "", "T"),
                                       new GridColumn("approvedDate", "Send Date", "", "D"),
@@ -148,6 +148,7 @@ namespace Swift.web.Remit.CustomerSOA
             _grid.ShowCheckBox = true;
             _grid.IsGridWidthInPercent = true;
             _grid.MultiSelect = true;
+            _grid.DownloadAll = true;
             string sql = "";
             string searchType = HiddenSearchType.Value.ToString();
             if (!string.IsNullOrEmpty(customerId))

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

@@ -60,6 +60,16 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             if (dt == null)
                 return;
 
+            int totalTransactionCount = 0;
+
+            if (dt != null && dt.Rows.Count > 0)
+            {
+                totalTransactionCount = Convert.ToInt32(dt.Rows[0]["TotalCount"]);
+            }
+            else
+            {
+                totalTransactionCount = 0;
+            }
             int cols = dt.Columns.Count;
             var str = new StringBuilder();
             str.Append("<div class='table-container'>");
@@ -75,6 +85,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
 
             Dictionary<string, DataTable> payoutPartnerData = new Dictionary<string, DataTable>();
             
+
             foreach (DataRow dr in dt.Rows)
             {
                 string payoutPartner = dr["PAYOUT_PARTNER"].ToString().Trim();
@@ -90,6 +101,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             }
 
             StringBuilder combinedTables = new StringBuilder();
+            combinedTables.Append("<h3><b>Total Transactions: " + totalTransactionCount + "</b></h3>");
 
             foreach (var partnerData in payoutPartnerData)
             {
@@ -103,6 +115,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
 
                 strTable.Append("<tr>");
                 strTable.Append("<th>SN</th>");
+
                 foreach (DataColumn col in partnerTable.Columns)
                 {
                     strTable.Append("<th><div align=\"left\">" + col.ColumnName + "</div></th>");
@@ -110,6 +123,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                 strTable.Append("</tr>");
 
                 int sn = 1;
+
                 foreach (DataRow row in partnerTable.Rows)
                 {
                     string payStatus = row["PAYSTATUS"].ToString();
@@ -157,18 +171,24 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                     sn++;
                 }
 
-
                 strTable.Append("<tr>");
                 strTable.Append("<td align=\"left\"><b>Total</b></td>");
 
                 for (int i = 0; i < partnerTable.Columns.Count; i++)
                 {
-                    if (i == 13 || i == 15 || i == 16 || i == 17 || i == 21 || i == 22)
+                    if (i == 13 || i == 15 || i == 16 || i == 17 || i == 22 || i == 23)
                     {
                         decimal total = partnerTable.AsEnumerable()
                             .Sum(row => decimal.TryParse(row[i].ToString(), out decimal val) ? val : 0);
+                        if(i == 22)
+                        {
+                            strTable.Append("<td align=\"left\"><b>" + total + " USD</b></td>");
+                        }
+                        else
+                        {
+                            strTable.Append("<td align=\"left\"><b>" + total + " GBP</b></td>");
+                        }
 
-                        strTable.Append("<td align=\"left\">" + total + "</td>");
                     }
                     else
                     {
@@ -178,6 +198,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
 
                 strTable.Append("</tr>");
                 strTable.Append("</table>");
+
                 combinedTables.Append(strTable.ToString());
             }