Merge branch 'feature/Redmine-16525-Cosmetic_Changes' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into feature/Redmine-16525-Cosmetic_Changes

Swift.API/Common/Enum/Notification.cs

@@ -12,64 +12,49 @@ namespace Swift.API.Common.Enum
     {
         NONE,
 
-        [Description("Email to New customer After approval. Core")]
-        NEW_REGISTER_WELCOME,
-
-        [Description("Email for OTP. JsonRX")]
-        OTP_EMAIL,
-
-        [Description("Email to customer after KYC verification. Core")]
-        CUSTOMER_KYC_APPROVED,
-
-        [Description("Email to customer after Renew ID approved. Core")]
-        RENEW_ID_APPROVED,
-
-        [Description("Email to customer for Tranfast Txn in case no balance in wallet. Job")]
-        TF_TXN_NO_BALANCE,
-
-        [Description("Email to customer for Tranfast after expiry. Job")]
-        TF_TXN_EXPIRED,
-
-        [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD,
-
-        [Description("Notify to USer For Force Password Change")]
-        FORCE_PASSWORD_CHANGE,
-
-        [Description("Notify to USer For Force Pin Change")]
-        FORCE_PIN_CHANGE,
 
         [Description("Email to customer txn is created for bank transfer")]
-        BANK_TRANSFER_TXN_PENDING,
+        BANK_TRANSFER_TXN_PENDING = 1,
 
         [Description("Email to customer after txn payment is cleared by IME London")]
-        BANK_TRANSFER_TXN_CLEARED,
+        BANK_TRANSFER_TXN_CLEARED = 2,
 
         [Description("Email to customer after txn is accepted by Pay-out partner")]
-        BANK_TXN_POST,
+        BANK_TXN_POST = 3,
 
         [Description("Email to customer after txn has been accepted by Pay-out partner (Cash Collection)")]
-        CASH_TXN_POST,
+        CASH_TXN_POST = 4,
 
         [Description("Email to customer for reset password. JsonRX")]
-        RESET_PASSWORD_EMAIL,
+        RESET_PASSWORD_EMAIL = 5,
 
         [Description("Email to customer after Basic Registration has been completed")]
-        BASIC_REGISTRATION_EMAIL,
+        BASIC_REGISTRATION_EMAIL = 6,
 
         [Description("Email to customer after KYC completion")]
-        KYC_VERIFICATION_EMAIL,
+        KYC_VERIFICATION_EMAIL = 7,
+
+        [Description("Email to customer for OTP")]
+        OTP_EMAIL = 8,
+        
+        FORCE_PASSWORD_CHANGE=9,
+
+        TRANSACTION_APPROVED = 10,
+
+        TRANSACTION_MODIFY = 11,
 
-        TRANSACTION_APPROVED,
+        JP_POST_APPROVED = 12,
 
-        TRANSACTION_MODIFY,
+        TRANSACTION_CANCELLED = 13,
 
-        JP_POST_APPROVED,
+        TRANSACTION_PAID = 14,
 
-        TRANSACTION_CANCELLED,
+        TRANSACTION_SUCCESS = 15,
 
-        TRANSACTION_PAID,
+        TF_NO_BALANCE = 16,
 
-        TRANSACTION_SUCCESS,
+        CUSTOMER_MOBILE_NOT_REGISTER = 17,
+        CUSTOMER_LAWSON_REGISTER = 18,
+        CUSTOMER_REFERRAL_500 = 19
     }
 }

Swift.DAL/Remittance/CustomerDeposits/CustomerDepositDao.cs

@@ -268,8 +268,27 @@ namespace Swift.DAL.Remittance.CustomerDeposits
         {
             var sql = "EXEC GetUserInfo @flag='get-txn-details' ";
             sql += ", @tranId = " + FilterString(tranId);
+              var row = ExecuteDataRow(sql);
 
-            return ParseDbResult<TxnDetails>(sql);
+            TxnDetails userDetails = new TxnDetails();
+            if (row != null)
+            {
+                userDetails.senderName = row["senderName"].ToString();
+                userDetails.PayoutCountry = row["pcountry"].ToString();
+                userDetails.BeneficiaryName = row["receiverName"].ToString();
+                userDetails.TransferType = row["paymentMethod"].ToString();
+                userDetails.BankName = row["pBankName"].ToString();
+                userDetails.BankBranch = row["pBankBranch"].ToString();
+                userDetails.email = row["email"].ToString();
+                userDetails.AccountNo = row["accountNo"].ToString();
+                userDetails.PayoutAmount = row["pAmt"].ToString();
+                userDetails.TransferAmount = row["tamt"].ToString();
+                userDetails.TotalAmount = row["camt"].ToString();
+                userDetails.serviceCharge = row["serviceCharge"].ToString();
+                userDetails.rewardPoints = row["rewardPoints"].ToString();
+                userDetails.TranDate = row["createdDate"].ToString();
+            }
+            return userDetails;
         }
 
         private T ParseDbResult<T>(string sql)

Swift.web/Remit/Administration/CustomerRegistration/UpdateKYC.aspx.cs

@@ -114,11 +114,14 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             startDate.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
             if (jsonRes.ResponseCode == "0")
             {
+                try
+                {
                 CustomerDetails cd = _cd.GetUserDetails(selecteduserId);
 
                 List<Mapping> bodyMappings = new List<Mapping>();
 
                 bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = cd.FullName });
+                    bodyMappings.Add(new Mapping() { SValue = "RefCode", SText = cd.MembershipId });
                 bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = cd.CustomerId.ToString() });
                 bodyMappings.Add(new Mapping() { SValue = "UserId", SText = cd.MembershipId });
                 bodyMappings.Add(new Mapping() { SValue = "FirstName", SText = cd.FirstName });
@@ -151,7 +154,12 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                     }
                 };
 
-                jsonRes = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+                     NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+                }
+                catch (Exception ex)
+                {
+                    GetStatic.LogError(ex);
+                }
                 trackingNo.Text = "";
                 GetStatic.AlertMessage(this, jsonRes.Msg);
                 string custInfo = selecteduserId + "," + GetCustomerName(selecteduserId);

Swift.web/Remit/Transaction/ApproveTxn/holdTxnListMobile.aspx

@@ -149,7 +149,7 @@
 
     <form id="form1" runat="server">
 
-        &nbsp;<asp:ScriptManager ID="ScriptManager1" runat="server">
+        <asp:ScriptManager ID="ScriptManager1" runat="server">
         </asp:ScriptManager>
         <div class="page-wrapper">
             <div class="row">

Swift.web/Remit/UserControl/UcTransaction.ascx

@@ -773,7 +773,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>Fee</td>
+                            <td>Customer Premium</td>
                             <td class="amt">
                                 <asp:Label ID="handling" runat="server"></asp:Label>
                             </td>
@@ -805,12 +805,17 @@
                     <table class="table table-bordered table-striped" style="width: 100%">
 
                         <tr>
-                            <td>Payment Option: </td>
+                            <td>Mode of Payment: </td>
                             <td class="text">
                                 <asp:Label ID="modeOfPayment" runat="server"></asp:Label>
                             </td>
                         </tr>
-
+                        <tr>
+                            <td>Mode of Deposit: </td>
+                            <td class="text">
+                                <asp:Label ID="modeOfDeposit" runat="server"></asp:Label>
+                            </td>
+                        </tr>
                         <tr>
                             <td class="DisFond">Pay Status:</td>
                             <td class="DisFond">

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

@@ -360,7 +360,8 @@ namespace Swift.web.Remit.UserControl
                     pAgentLocation.Text = tRow["pAgentLocation"].ToString();
 
                     pAgentName.Text = tRow["pAgentName"].ToString();
-                    modeOfPayment.Text = tRow["depositType"].ToString();
+                    modeOfPayment.Text = tRow["paymentMethod"].ToString();
+                    modeOfDeposit.Text = tRow["depositType"].ToString();
                     payer.Text = tRow["payerName"].ToString();
 
                     tranStatus.Text = tRow["tranStatus"].ToString();
@@ -1689,7 +1690,7 @@ namespace Swift.web.Remit.UserControl
                     }
                     pAgentName.Text = tRow["pAgentName"].ToString();
                     modeOfPayment.Text = tRow["paymentMethod"].ToString();
-
+                    modeOfDeposit.Text = tRow["depositType"].ToString();
                     tranStatus.Text = tRow["tranStatus"].ToString();
                     payStatus.Text = tRow["payStatus"].ToString();
 

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

@@ -825,6 +825,7 @@ namespace Swift.web.Remit.UserControl
         protected global::System.Web.UI.WebControls.Label modeOfPayment;
 
         /// <summary>
+        protected global::System.Web.UI.WebControls.Label modeOfDeposit;
         /// payStatus control.
         /// </summary>
         /// <remarks>