Merge branch 'master' of http://202.166.220.79:3000/IME-LONDON/PUSH_JOB into feature/Redmine-17825-Email_Template

SendMail/API/ThirdPartyAPI.cs

@@ -1,7 +1,7 @@
 using Common;
 using JMETxnPushScheduler.Business;
 using JMETxnPushScheduler.Common;
-using log4net;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;

SendMail/App.config

@@ -9,12 +9,12 @@
     <!--<add name="Connections" connectionString="server=202.166.220.36,1433;Database=FastMoneyPro_Remit;uid=jmeuser;pwd=P@ssw0rd@321!" providerName="system.data.sqlclient" />-->
     <!--<add name="Connections" connectionString="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=user_stag;pwd=P@ssw0rd" providerName="system.data.sqlclient" />-->
 
-    <add name="Connections" connectionString="server=77.68.90.58,1433;Database=FastMoneyPro_Remit;uid=remituser;pwd=U78SclK6" providerName="system.data.sqlclient" />
+    <add name="Connections" connectionString="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=user_stag;pwd=P@ssw0rd" providerName="system.data.sqlclient" />
 
   </connectionStrings>
   <appSettings>
     <!--<add key="JMECoreAPIURL" value="http://10.90.77.51:8081/" />-->
-    <add key="JMECoreAPIURL" value="http://localhost:65345/" />
+    <add key="JMECoreAPIURL" value="http://77.68.15.91:1083/" />
     <!--<add key="JMECoreAPIURL" value="http://192.168.53.21:8082/" />-->
     <add key="JMECoreAPI_HeaderToken" value="KPb1ttRs3CJnORpVU8SmAKUs7a42vtvjzQ47gU0b4u0vxAEI0PgZref6puzkVhLTX2PRNMGCbnb2TglupsjV5AGhYvw8a8POTcUcFSrEdHmTkhkIGNvUvxSpKjUOXGFQWaGU1bxoqqUSaFOmNE5zGojVmwPoMy38CNLwnpQKjdsIuxCKGCApa2gWHJl9gebmIpUODv9jAZgmMEaXqyR4CLg4iSksfTyYNjdqxEE88P5THYt5GuNk8Ti6K2RxIKfPWY49hBOpiYnXcApgSDiKFYqQG9WuZ7cvDGJIWg5WgWKjGle8Y3OydhONXVkN5OMPXDA4VZkK4c5nM363Zkg4w4qdzWuwhsEoAwU4rej6sMRZue3L0BowBJja1OK0iPoTX70EexX8rviMLOZPUDwhxzkL3eODS69VEEbjHb8WSjhho5h3KnCE4tcqCWihwSZ8Yuyhw1rzIMNw2C8pN1GEJyXc6goIFkf7dmK9ynJSxu52D9GjOkKqoD7dFNFulOFVfgeCuhPDYG2A2c2RSvGHv24VDXvmGVaAMLiPtsTz5oD8f0na7fX1xGg0Qveh0KgQL5THnrMK6gm5Ky7O8nbecIxY" />
     <add key="LogFile" value="D:/Office/SourceCodes/git-repo/JME/Console Jobs/TxnPushJob/SendMail/Logs/log.txt" />

SendMail/Business/TxnPush.cs

@@ -49,6 +49,8 @@ namespace JMETxnPushScheduler.Business
                         {
                             _txnPush.UpdateTxnPost(item["ID"].ToString(), result.Extra);
                             GetTxnDetails(item["ID"].ToString());
+
+                            _txnPush.UpdateTxnInstantPaid(item["ID"].ToString());
                         }
                         else if (result.ResponseCode == "100")//Transaction has been processed for Bank Deposit.
                         {
@@ -61,6 +63,14 @@ namespace JMETxnPushScheduler.Business
                             // GetTxnDetails(item["ID"].ToString());
                         }
                     }
+                    else if (_dbRes.Msg == "394449") //GCC
+                    {
+                        if (result.ResponseCode == "0")
+                        {
+                            _txnPush.UpdateTxnPost(item["ID"].ToString(), result.Extra, result.Id);
+                            GetTxnDetails(item["ID"].ToString());
+                        }
+                    }
                     else
                     {
                         if (result.ResponseCode == "0")
@@ -201,6 +211,7 @@ namespace JMETxnPushScheduler.Business
                     var request = new TFReleaseTxnRequest()
                     {
                         TfPin = item["CONTROLNO"].ToString(),
+                        TxnId = item["CONTROLNO2"].ToString(),
                         RequestBy = "scheduler",
                         UserName = "scheduler",
                         ProviderId = item["sSuperAgent"].ToString(),
@@ -214,7 +225,9 @@ namespace JMETxnPushScheduler.Business
                     Console.WriteLine("Release txn completed with response msg: " + result.Msg);
                     if (result.ResponseCode == "0")
                     {
-                        _txnPush.UpdateTxnPost(item["ID"].ToString());
+                        // _txnPush.UpdateTxnPost(item["ID"].ToString());
+
+                        _txnPush.UpdateTxnPostRelease(item["ID"].ToString());
                     }
                     else
                     {

SendMail/Common/CommonResponse.cs

@@ -52,6 +52,7 @@
     public class TFReleaseTxnRequest
     {
         public string TfPin { get; set; }
+        public string TxnId { get; set; }
         public string ProcessId { get; set; }
         public string UserName { get; set; }
         public string ProviderId { get; set; }

SendMail/DAO/TxnPushDAO.cs

@@ -20,15 +20,22 @@ namespace JMETxnPushScheduler.DAO
             return ExecuteDataTable(sql);
         }
 
-        public void UpdateTxnPost(string id, string pCurrCostRate = null )
+        public void UpdateTxnPost(string id, string pCurrCostRate = null, string controlNo2 = null )
         {
             string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'UPDATE-POST'";
             sql += ", @TRAN_ID = " + FilterString(id);
+            sql += ", @control2 = " + FilterString(controlNo2);
             sql += ", @pCurrCostRate = " + FilterString(pCurrCostRate);
            
             ExecuteDataTable(sql);
         }
 
+        public void UpdateTxnPostRelease(string id,string controlNo2 = null)
+        {
+            string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'UPDATE-POST_RELEASE'";
+            sql += ", @TRAN_ID = " + FilterString(id);
+            ExecuteDataTable(sql);
+        }
         public void UpdateTxnInstantPaid(string id)
         {
             string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'INSTANT-PAID'";

SendMail/Program.cs

@@ -11,7 +11,8 @@ namespace SendMail
             Console.WriteLine("Scheduler started on: " + DateTime.Now);
             TxnPush _txnPush = new TxnPush();
             _txnPush.TxnSyncMain();
-          //  _txnPush.TxnReleaseMain();
+
+           _txnPush.TxnReleaseMain();
             Console.WriteLine("Scheduler started on: " + DateTime.Now);