From 123701b40baf48ac49b80ca7b4a810cb7a527fde Mon Sep 17 00:00:00 2001 From: lch Date: Mon, 10 May 2021 07:45:09 +0000 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EC=98=81=EC=88=98?= =?UTF-8?q?=EC=A6=9D=20=EC=B6=9C=EB=A0=A5,=20=ED=98=84=EA=B8=88=EC=98=81?= =?UTF-8?q?=EC=88=98=EC=A6=9D=20=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=98=81=EC=88=98=EC=A6=9D?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20js=20url=20=EB=B3=80=EA=B2=BD=20https://pg?= =?UTF-8?q?web.tosspayments.com:7085/WEB=5FSERVER/js/receipt=5Flink.js=20-?= =?UTF-8?q?>=20https://pgweb.tosspayments.com:7086/WEB=5FSERVER/js/receipt?= =?UTF-8?q?=5Flink.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Base/Lib/Helpers.cs | 14 ++++++++++++++ FO/Controllers/MyController.cs | 5 +++-- FO/Views/My/Document.cshtml | 22 ++++++++++++++-------- FO/Views/My/PayInfo.cshtml | 2 +- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Base/Lib/Helpers.cs b/Base/Lib/Helpers.cs index 15d8efc..e981d5e 100644 --- a/Base/Lib/Helpers.cs +++ b/Base/Lib/Helpers.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; @@ -464,4 +465,17 @@ public static class Helpers } return retVal; } + + public static string MD5Hash(string data) + { + var mdHash = MD5.Create(); + byte[] hash = mdHash.ComputeHash(Encoding.UTF8.GetBytes(data)); + StringBuilder stringBuilder = new StringBuilder(); + foreach (byte b in hash) + { + stringBuilder.AppendFormat("{0:x2}", b); + } + + return stringBuilder.ToString(); + } } diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index e12c0a0..31d938c 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -7,6 +7,8 @@ using System.Web.Mvc; using NP.Model; using NP.Base; using System.Web.Routing; +using System.Security.Cryptography; +using System.Text; namespace NP.FO.Controllers { @@ -245,8 +247,7 @@ namespace NP.FO.Controllers return Redirect("/My/Paies"); } vm.Pay.mid = (("test".Equals(GetConfig("CST_PLATFORM").Trim())) ? "t" : "") + GetConfig("CST_MID"); - - String authdata = vm.Pay.mid + vm.Pay.pgkey + GetConfig("LGD_MERTKEY"); + vm.Pay.authdata = Helpers.MD5Hash(vm.Pay.mid + vm.Pay.pgkey + GetConfig("LGD_MERTKEY")); vm.PayItems = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }); vm.PayItem = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }).FirstOrDefault(); vm.intval3 = Dao.Get("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno }/*,{ "rstatus", 0}*/, { "withoutrstatus" , "4" } }).Count(); diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index 947f515..6e26f43 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -102,7 +102,7 @@ @Html.Raw("-") } - + @if (item.pstatus == 1 && item.rstatus == 0) { if (item.ptype == 6) @@ -111,13 +111,13 @@ } else if (item.ptype == 1 && item.ispg == 1) /*신용카드*/ { - [인쇄] + [인쇄] } else if (item.ptype == 3 && item.ispg == 1) /*가상계좌*/ { if (item.iscashrct == 1) /*현금영수증신청*/ { - [인쇄] + [인쇄] } else { @@ -129,7 +129,7 @@ } else if (item.iscancel == 1) /*취소시 일반영수증*/ { - [인쇄] + [인쇄] } else { @@ -144,7 +144,7 @@ } else { - [인쇄] + [인쇄] } } } @@ -419,8 +419,14 @@ else msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요."); } } - function viewtax(pgkey) { - showReceiptByTID('@(ViewBag.mid)', pgkey, '@(ViewBag.mid)+pakey+@(ViewBag.mertkey)'); + function viewtax(pgkey, authdata) { + showReceiptByTID('@(ViewBag.mid)', pgkey, authdata); + } + function viewtaxcash(payno) { + var seqno = '001'; + var LGD_OID = "@(@System.Web.Configuration.WebConfigurationManager.AppSettings["PAYMENT_CLASSIFICATION"])" + String(payno); + var service_type = "@(@System.Web.Configuration.WebConfigurationManager.AppSettings["CST_PLATFORM"])"; + showCashReceipts('@(ViewBag.mid)', LGD_OID, seqno, 'CAS', service_type); } function viewtaxinvoice(payno) { capp('/fcommon/paytaxinvoiceview', { payno: payno }, 'cbviewtaxinvoice'); @@ -576,7 +582,7 @@ else @if (ViewBag.isPayTest == "1") { //테스트일 경우 - + } else { diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index e8a1354..7719b5e 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -698,7 +698,7 @@ @if (ViewBag.isPayTest == "1") { //테스트일 경우 - + } else {