diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index e1837ec..ae3aef7 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -940,6 +940,7 @@ a.pplno=#pplno# a.userno=#userno# + b.pstatus > 0 diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs index 417d94f..f5c9121 100644 --- a/FO/Controllers/FOBaseController.cs +++ b/FO/Controllers/FOBaseController.cs @@ -657,7 +657,7 @@ namespace NP.FO.Controllers if (vm.Pay.ptype == 3) { try { - vm.PPLog = Dao.Get("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo } }).FirstOrDefault(); + vm.PPLog = Dao.Get("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo },{"istax",1 } }).FirstOrDefault(); if (payno > 0 && vm.PPLog != null && vm.PPLog.pstatus == 22 && vm.PPLog.isbill == 1) { PayTax payTax = new PayTax(); diff --git a/FO/Views/Account/SNSLinkCallback.cshtml b/FO/Views/Account/SNSLinkCallback.cshtml index 6b717e0..aa91e68 100644 --- a/FO/Views/Account/SNSLinkCallback.cshtml +++ b/FO/Views/Account/SNSLinkCallback.cshtml @@ -94,7 +94,7 @@ } else if(capResult.code == -99){ alert("이미 연동된 SNS 계정입니다. SNS 계정을 다시 확인해주세요."); - return; + goRefresh(); } else { alert("SNS 연동에 실패하였습니다. \r\n관리자에게 문의하세요."); diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index 6c0ad8f..9ef3976 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -172,15 +172,15 @@ } else { - if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/ - { - @*[요청]*@ - [인쇄] - } - else - { - [인쇄] - } + //if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/ + //{ + [요청] + @*[인쇄]*@ + //} + //else + //{ + @*[인쇄]*@ + //} } } }