Merge branch 'master' of http://202.166.220.79:3000/IME-LONDON/ThirdPartyAPI

# Conflicts:
#	Business/BusinessLogic/SMSApiService/SMSService.cs
#	Common/Models/Enums/GeneralEnum.cs
#	ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html
#	ThirdPartyAPIs/Config/Mapping.json
#	ThirdPartyAPIs/ThirdPartyAPIs.csproj

Business/Business.csproj

@@ -224,10 +224,6 @@
       <Project>{5a7b31a2-b799-4bae-8ece-12afb8eaa3cb}</Project>
       <Name>Transfast</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Wing\Wing.csproj">
-      <Project>{1505C180-8ED5-4357-B759-4EA68E74D047}</Project>
-      <Name>Wing</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

Business/BusinessLogic/TPApiServices/Factory/ApiFactoryServices.cs

@@ -8,7 +8,6 @@ using GMENepal.GMENepalAPIService;
 using log4net;
 using Transfast.ApiServices;
 using Unity;
-using Wing.ApiServices;
 
 namespace Business.BusinessLogic.TPApiServices.Factory
 {
@@ -53,11 +52,7 @@ namespace Business.BusinessLogic.TPApiServices.Factory
                 log.Debug("Choose Provider as Cebuana ");
                 apiFactory = _container.Resolve<CebuanaApi>();
             }
-            else if (providerNo == GetStatic.ReadWebConfig("Wing", ""))
-            {
-                log.Debug("Choose Provider as Wings ");
-                apiFactory = _container.Resolve<WingApi>();
-            }
+            
             return apiFactory;
         }
     }

GMENepal/GMENepalAPIService/GMENepalAPI.cs

@@ -227,6 +227,7 @@ namespace GMENepal.GMENepalAPIService
         {
             GMESendMoney gS = SendModelMap(sendTransaction);
             DbResult model = new DbResult();
+            SendMoneyResult sendMoneyRes = new SendMoneyResult();
             TPResponse _response = new CustomModelValidaton().IsModelValid(gS);
             if (_response == null)
             {
@@ -236,6 +237,33 @@ namespace GMENepal.GMENepalAPIService
                 string dateTxn = dt[1] + "-" + dt[2] + "-" + dt[0];
 
                 _log.Info("SendTransaction | REQUEST :" + JsonConvert.SerializeObject(gS).ToString());
+                if(gS.PaymentMethod.ToLower() == "cash payment")
+                {
+                    _response = new TPResponse();
+
+                    var exRate = _fastMoneyWeb.GetCalculation(
+                    gS.PartnerId, gS.UserName, gS.Password, gS.SessionId, "",
+                    gS.SendingAmount, gS.PaymentMethod, gS.BeneCountry, gS.CalculateBy
+                    );
+                    _log.Info("GetExRate | RESPONSE :" + JsonConvert.SerializeObject(model).ToString());
+
+                    var exConfirmId = exRate.ExConfirmId;
+
+                    sendMoneyRes = _fastMoneyWeb.SendMoney(PartnerId, UserName, Password, gS.SessionId, exConfirmId, gS.MembershipId, gS.CustomerName, gS.CustomerAddress, 
+                        gS.CustomerContact, gS.CustomerCity, gS.CustomerCountry, gS.CustomerIdType, gS.CustomerIdNumber, gS.BeneName, gS.BeneAddress, gS.BeneContact, gS.BeneCity
+                                        , gS.BeneCountry, gS.Profession, gS.IncomeSource, gS.Relationship, gS.PurposeOfRemittance, gS.SendingAmount, gS.ReceivingAmount, gS.PaymentMethod
+                                        , gS.BankCode, gS.BankName, gS.BankBranchName, gS.BankAccountNumber, gS.TransactionDate, gS.CalculateBy, gS.FreeCharge);
+                    _log.Info("SendTransaction | RESPONSE :" + JsonConvert.SerializeObject(model).ToString());
+
+                    _response.ResponseCode = sendMoneyRes.ErrorCode;
+                    _response.Msg = sendMoneyRes.Message;
+                    _response.Extra = sendMoneyRes.ExRate;
+                    _response.Extra2 = sendMoneyRes.SendingAmount;
+                    _response.Id = sendMoneyRes.ReceivingAmount;
+                    _response.Data = sendMoneyRes;
+
+                    return _response;
+                }
                 if (gS.BankCode.ToLower() == "imepay" || gS.BankCode.ToLower() == "khalti")
                 {
                     model = _fastMoneyWeb.RealTimeWalletDeposit(PartnerId, UserName, Password, gS.BankCode, gS.CustomerName, gS.CustomerAddress

GMENepal/Model/GMESendMoney.cs

@@ -63,7 +63,7 @@ namespace GMENepal.Model
         public string Relationship { get; set; }
 
         [MaxLength(50)]
-        [Required]
+        [Required]  
         public string PurposeOfRemittance { get; set; }
 
         [MaxLength(50)]