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

Swift.web/Payment/STPaymentCustomerRedirect.aspx.cs

@@ -10,7 +10,7 @@ using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using UAParser;
+
 
 namespace Swift.web.Payment
 {
@@ -33,16 +33,16 @@ namespace Swift.web.Payment
                 {
                     string uaString = HttpContext.Current.Request.Headers["User-Agent"].ToString();
 
-                    var uaParser = Parser.GetDefault();
+                    //var uaParser = Parser.GetDefault();
 
-                    ClientInfo c = uaParser.Parse(uaString);
+                    //ClientInfo c = uaParser.Parse(uaString);
                     RemittanceLibrary _remit = new RemittanceLibrary();
                     SwiftLibrary sl = new SwiftLibrary();
                     var tranid = HttpUtility.UrlDecode(WebUtils.DecryptString(eid));
                     var controlNo = HttpUtility.UrlDecode(WebUtils.DecryptString(cn));
                     var siteRef = GetStatic.ReadWebConfig("sitereference", "");
 
-                    Utility.LogRequest(tranid, "TRUSTPAY", "CustomerRedirect", controlNo, JsonConvert.SerializeObject(c), siteRef);
+                   // Utility.LogRequest(tranid, "TRUSTPAY", "CustomerRedirect", controlNo, JsonConvert.SerializeObject(c), siteRef);
 
                     string sql = "EXEC proc_trust_payment @Flag = 'u-details',@type='data'," +
                         " @refId = " + sl.FilterString(uniqueId) +", @tranid = " + sl.FilterString(tranid) + ", @orderreference = " + sl.FilterString(controlNo) + "";
@@ -67,7 +67,7 @@ namespace Swift.web.Payment
                     sitereference.Value = siteRef;
                     orderreference.Value = Convert.ToString(dt.Rows[0]["ControlNo"]);
                     sitesecuritytimestamp.Value = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss");
-                    mainamount.Value = Convert.ToString(dt.Rows[0]["camt"]);
+                    mainamount.Value = GetStatic.ShowTwoDecimal((dt.Rows[0]["camt"]).ToString());
 
                     billingpostcode.Value = customerpostcode.Value = Convert.ToString(dt.Rows[0]["zipcode"]);
 

Swift.web/Payment/trans_payment_success.aspx.cs

@@ -43,25 +43,25 @@ namespace Swift.web.Payment
                 lblStatusDetail.Text = Convert.ToString(dt.Rows[0]["STATUS"]);
 
                 lblCountry.Text = Convert.ToString(dt.Rows[0]["pCountry"]);
-                lblAmount.Text = Convert.ToString(dt.Rows[0]["pamt"]);
+                lblAmount.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["pamt"]).ToString());
                 lblBenficiaryName.Text = Convert.ToString(dt.Rows[0]["receivername"]);
                 lblorderreference.Text = Convert.ToString(dt.Rows[0]["ControlNo"]);
                 lblTransactionId.Text = Convert.ToString(dt.Rows[0]["id"]);
                 lblTxnDate.Text = Convert.ToString(dt.Rows[0]["createdDate"]);
                 lblRecName.Text = Convert.ToString(dt.Rows[0]["receivername"]);
                 lblReceiverAddress.Text = Convert.ToString(dt.Rows[0]["raddress"]);
-                lblCollectedAmount.Text = Convert.ToString(dt.Rows[0]["camt"]);
-                lblServiceFee.Text = Convert.ToString(dt.Rows[0]["servicecharge"]);
-                lblTotalSentAmount.Text = Convert.ToString(dt.Rows[0]["tamt"]);
-                lblExchangeRate.Text = Convert.ToString(dt.Rows[0]["customerRate"]);
-                lblTotalPayoutAmount.Text = Convert.ToString(dt.Rows[0]["pamt"]);
+                lblCollectedAmount.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["camt"]).ToString());
+                lblServiceFee.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["servicecharge"]).ToString());
+                lblTotalSentAmount.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["tamt"]).ToString());
+                lblExchangeRate.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["customerRate"]).ToString());
+                lblTotalPayoutAmount.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["pamt"]).ToString());
                 lblDeliveryMethod.Text = Convert.ToString(dt.Rows[0]["paymentMethod"]);
                 lblBankName.Text = Convert.ToString(dt.Rows[0]["pbankname"]);
                 lblBankBranch.Text = Convert.ToString(dt.Rows[0]["pbankBranchName"]);
                 lblBankAccountNo.Text = Convert.ToString(dt.Rows[0]["accountNo"]);
                 lblPurposeOfRemittance.Text = Convert.ToString(dt.Rows[0]["purposeofremit"]);
                 //lblPromotionPremiumRate.Text = Convert.ToString(dt.Rows[0]["PromotionPremiumRate"]);
-                lblPromotionDiscount.Text = Convert.ToString(dt.Rows[0]["PromotionDiscount"]);
+                lblPromotionDiscount.Text = GetStatic.ShowTwoDecimal((dt.Rows[0]["PromotionDiscount"]).ToString());
                 lblPaidBy.Text = Convert.ToString(dt.Rows[0]["collMode"]);
                 //lblpaymenttypedescription.Text = GetStatic.ReadQueryString("paymenttypedescription", "");
                 //lblrequestreference.Text = GetStatic.ReadQueryString("requestreference", "");

Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx

@@ -1219,7 +1219,7 @@
                                                         <div class="form-group">
                                                             <label id="verificationType">Verification Type No.:<span class="errormsg">*</span></label>
                                                             <div class="input-group input-append date dpYears">
-                                                                <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="14" CssClass="form-control required" />
+                                                                <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="20" CssClass="form-control required" />
                                                                 <div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
                                                             </div>
                                                         </div>