dashboard count fix.

Swift.DAL/Remittance/CustomerDeposits/CustomerDepositDao.cs

@@ -289,6 +289,7 @@ namespace Swift.DAL.Remittance.CustomerDeposits
                 userDetails.serviceCharge = row["serviceCharge"].ToString();
                 userDetails.rewardPoints = row["rewardPoints"].ToString();
                 userDetails.TranDate = row["createdDate"].ToString();
+                userDetails.ExRate = row["customerRate"].ToString();
             }
             return userDetails;
         }

Swift.web/DashboardV2/Dashboard2.aspx.cs

@@ -248,17 +248,25 @@ namespace Swift.web.DashboardV2
 
 
             if (ds.Tables.Count > 1)
-             {
-                if (ds.Tables[1] != null || ds.Tables[1].Rows.Count <= 0)
+            {
+                if (ds.Tables[1] != null && ds.Tables[1].Rows.Count > 0)
                 {
                     try
                     {
-                        data.ComplianceData = new ComplianceData
+                        data.ComplianceData = new ComplianceData();
+                        foreach (DataRow item in ds.Tables[1].Rows)
                         {
-                            OFACComplianceMobileTxnsKycLater = Convert.ToString(ds.Tables[1].Rows[0]["Count"]),
-                            OFACComplianceTxns = Convert.ToString(ds.Tables[1].Rows[1]["Count"]),
-                            // OFACComplianceMobileTxnsKycNow = Convert.ToString(ds.Tables[1].Rows[2]["Count"])
-                        };
+                            if(item["Head"].ToString().Contains("Mobile") || item["Head"].ToString().Contains("Web"))
+                            {
+                                data.ComplianceData.OFACComplianceMobileTxnsKycLater = Convert.ToString(item["Count"]);
+                            }
+                            else
+                            {
+                                data.ComplianceData.OFACComplianceTxns = Convert.ToString(item["Count"]);
+                            }
+
+                        }
+                       
                     }
                     catch (Exception ex)
                     {
@@ -352,7 +360,7 @@ namespace Swift.web.DashboardV2
                                        .Select(x => new { BranchName= x.Field<string>("sAgentName"), CurrentMonth = (x.Field<int>("CurrentMonth")).ToString(), PreviousMonth = (x.Field<int>("PreviousMonth")).ToString() })
                                       .ToList();
                 }
-            }
+            }                     
 
             if (ds.Tables.Count > 7)
             {
@@ -454,7 +462,6 @@ namespace Swift.web.DashboardV2
             public string OFACComplianceMobileTxnsKycLater { get; set; }
             //public string OFACComplianceMobileTxnsKycNow { get; set; }
         }
-
         public class CustomerData
         {
             public string TotalCustomers { get; set; }
@@ -489,7 +496,6 @@ namespace Swift.web.DashboardV2
             public string BranchName { get; set; }
             public string TxnCount { get; set; }
         }
-
         public class KycStatus
         {
             public string KycNotCompleted { get; set; }

Swift.web/DashboardV2/assets/js/dashboardv2.js

@@ -114,8 +114,10 @@ function LoadChartData() {
 
     if (loadDate) {
         //Compliance/OFAC Hold Transactions
+        if (Response.ComplianceData != null) {
         $('#complianceHoldCount').text(Response.ComplianceData.OFACComplianceTxns);
         $('#complianceHoldCountMobileKycLater').text(Response.ComplianceData.OFACComplianceMobileTxnsKycLater);
+        }
        // $('#complianceHoldCountMobileKycNow').text(Response.ComplianceData.OFACComplianceMobileTxnsKycNow);
 
         //Customer Count data

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

@@ -55,9 +55,6 @@
             height: 300px;
             width: 400px
         }
-        .lowercase {
-            text-transform: lowercase !important;
-        }
     </style>
     <script>
         $(document).ready(function () {
@@ -1270,7 +1267,7 @@
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>E-Mail ID:</label>
-                                                    <asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control lowercase" />
+                                                    <asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control" />
                                                     <asp:RegularExpressionValidator ID="rev1" runat="server" Display="Dynamic"
                                                         ErrorMessage="Invalid Email Id!" ForeColor="Red" SetFocusOnError="True" ValidationGroup="send"
                                                         ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" CssClass="inv"

Swift.web/Remit/Transaction/VerifyMobileTransaction/VerifyMobileTransaction.aspx

@@ -251,21 +251,7 @@
             //    //}
             //}
             dataToSend = { MethodName: 'Verify', tranId: id, DepositType:depositType };
-            if (collMode == "Cash Collect") {
-                if (confirm('Do you want to verify cash collect?')) {
-                    $.post("", dataToSend, function (response) {
-                        var data = jQuery.parseJSON(response);
-                        if (data.ErrorCode == 0) {
-                            $("#loadGrid").click();
-                        } else {
-                            alert(data.Msg);
-                        }
-                    });
-                }
-            }
-            if (collMode == "Bank Deposit") {
-                debugger
-                if (confirm('Do you want to verify bank deposit?')) {
+            if (confirm('Do you want to verify the transaction?')) {
                     // if (confirm) {
                     $.post("", dataToSend, function (response) {
                         var data = jQuery.parseJSON(response);
@@ -275,7 +261,6 @@
                             alert(data.Msg);
                         }
                     });
-                }
             }
             return false;
         }

Swift.web/Remit/UserControl/UcTransaction.ascx

@@ -28,8 +28,10 @@
         .auto-style1 {
             height: 35px;
         }
+
         .btn-edit {
         .btn-edit {
+
         {
             color: #fff;
             background-color: #f0ad4e;
@@ -426,17 +428,8 @@
                         </tr>
                         <tr>
                             <td>CustomerId: </td>
-                            <td class="text" style="width: 150px">
-                                <asp:Label ID="customerId" runat="server"></asp:Label>
-                            </td>
-                            <%--<td>membership Id: </td>
-                            <td class="text" style="width: 60px;">
-                                <asp:Label ID="membershipId" runat="server"></asp:Label>
-                            </td>--%>
-                           
-                            <td>Membership Id: </td>
                             <td class="text" colspan="4">
-                                <asp:Label ID="membershipId" runat="server"></asp:Label>
+                                <asp:Label ID="customerId" runat="server"></asp:Label>
                             </td>
                         </tr>
                         <%--<tr>
@@ -495,15 +488,15 @@
                             </td>
                         </tr>
                         <tr runat="server" id="sCId">
-                            <td>Customer ID: </td>
+                            <td>Ext Customer ID: </td>
                             <td class="text" colspan="4">
                                 <asp:Label ID="sCustomerId" runat="server"></asp:Label>
                             </td>
                         </tr>
                         <tr runat="server" id="sDisMemId">
-                            <td>membership id: </td>
+                            <td>Membership Id: </td>
                             <td class="text" colspan="4">
-                                <asp:label id="sMemId" runat="server"></asp:label>
+                                <asp:Label ID="sMemId" runat="server"></asp:Label>
                             </td>
                         </tr>
                     </table>
@@ -827,12 +820,7 @@
                                 <asp:Label ID="modeOfDeposit" runat="server"></asp:Label>
                             </td>
                         </tr>
-                        <tr>
-                            <td>Payment Option: </td>
-                            <td class="text">
-                                <asp:Label ID="paymentOption" runat="server"></asp:Label>
-                            </td>
-                        </tr>
+                       
                          <tr>
                             <td>Trust Pay Id: </td>
                             <td class="text">

Swift.web/Remit/UserControl/UcTransaction.ascx.cs

@@ -154,7 +154,6 @@ namespace Swift.web.Remit.UserControl
             {
                 PanelKycDocumentUpload.Visible = false;
             }
-
             string showHideDocPanel = GetStatic.ReadQueryString("showDocPanel", "");
             if(showHideDocPanel == "N")
             {
@@ -209,15 +208,14 @@ namespace Swift.web.Remit.UserControl
                         sCId.Visible = false;
                     else
                         sCustomerId.Text = tRow["extCustomerId"].ToString();
-                    //if (tRow["sMemId"].ToString() == "")
-                    //    sDisMemId.Visible = false;
-                    //else
-                    //{
-                    //    sDisMemId.Visible = true;
-                    //    sMemId.Text = tRow["sMemId"].ToString();
-                    //}
 
-                    membershipId.Text = tRow["sMemId"].ToString();
+                    if (tRow["sMemId"].ToString() == "")
+                        sDisMemId.Visible = false;
+                    else
+                    {
+                        sDisMemId.Visible = true;
+                        sMemId.Text = tRow["sMemId"].ToString();
+                    }
 
                     if (tRow["rMemId"].ToString() == "")
                         rDisMemId.Visible = false;

Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

@@ -266,15 +266,6 @@ namespace Swift.web.Remit.UserControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label customerId;
 
-        /// <summary>
-        /// membershipId 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.Label membershipId;
-
         /// <summary>
         /// sAddress control.
         /// </summary>
@@ -842,15 +833,6 @@ namespace Swift.web.Remit.UserControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label modeOfDeposit;
 
-        /// <summary>
-        /// paymentOption 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.Label paymentOption;
-
         /// <summary>
         /// transactionReference control.
         /// </summary>