diff --git a/Common/Common.csproj b/Common/Common.csproj index 8261ea6..68d6d55 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -33,9 +33,6 @@ 4 - - ..\packages\ceTe.DynamicPDF.CoreSuite.NET.10.34.0\lib\net40\DynamicPDF.NETFramework40.dll - ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll @@ -76,11 +73,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/Common/Helper/GetStatic.cs b/Common/Helper/GetStatic.cs index de928ed..41f2df4 100644 --- a/Common/Helper/GetStatic.cs +++ b/Common/Helper/GetStatic.cs @@ -56,20 +56,17 @@ namespace Common.Helper { string fileName = GetDateTimeStamp() + "_" + user + ".pdf"; if (!string.IsNullOrEmpty(filePrefix)) - fileName = filePrefix + fileName; + fileName = filePrefix + "_" + fileName; - string fileLocation = ReadWebConfig("root", "") + "temp\\pdf\\" + fileName; HtmlToPdf converter = new HtmlToPdf(); - PdfDocument doc = converter.ConvertHtmlString(htmlString, ReadWebConfig("root", "")); - doc.Save(fileLocation); - doc.Close(); - if (!File.Exists(fileSaveLocation)) Directory.CreateDirectory(fileSaveLocation); - File.Move(fileLocation, fileSaveLocation + fileName); - + PdfDocument doc = converter.ConvertHtmlString(htmlString, ReadWebConfig("root", "")); + doc.Save(fileSaveLocation + fileName); + doc.Close(); + return fileName; } diff --git a/Common/packages.config b/Common/packages.config index 6347ad5..f073d00 100644 --- a/Common/packages.config +++ b/Common/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs index d5411c8..5605918 100644 --- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs +++ b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx.cs @@ -49,9 +49,6 @@ namespace JMEAgentSystem.WebPages.SendTxn string replaceText = "/WebPages/GetFileView.ashx?registerDate=" + Convert.ToDateTime(registerDate).ToString("yyyy-MM-dd") + "&customerId=" + customerId + "&membershipNo=" + membershipId + "&fileName=" + fileNameSignature; s = s.Replace(replaceText, path + fileNameSignature); - //s = s + ""; - String originalPath = new Uri(HttpContext.Current.Request.Url.AbsoluteUri).OriginalString; - string fileName = GetStatic.HTMLToPDF(s, GetStatic.GetUser(), path, "txn-req-form"); _customerServices.AddCustomerPDFUpload(customerId, GetStatic.GetUser(), fileName, "txn", GetRowId()); }