From 4da3724a6790b8b9d55dcccd1cf34f136dbb25e6 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Fri, 16 Jul 2021 06:06:28 +0000
Subject: [PATCH]

---
 Dao/MyBatis/Maps/Pay.xml                |  1 +
 FO/Controllers/FOBaseController.cs      |  2 +-
 FO/Views/Account/SNSLinkCallback.cshtml |  2 +-
 FO/Views/My/Document.cshtml             | 18 +++++++++---------
 4 files changed, 12 insertions(+), 11 deletions(-)

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 @@
           <dynamic prepend="where">
                 <isNotNull property="pplno" prepend="and">a.pplno=#pplno#</isNotNull>
                 <isNotNull property="userno" prepend="and">a.userno=#userno#</isNotNull>
+                <isNotNull property="istax" prepend="and">b.pstatus &gt; 0</isNotNull>
             </dynamic>
         </select>
         <select id="pay.payresult" parameterClass="hashtable" resultClass="payitem">
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<PPLog>("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo } }).FirstOrDefault();
+                                            vm.PPLog = Dao.Get<PPLog>("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일 이내까지 요청가능*/
-                                        {
-                                            @*<a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>*@
-                                            <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
-                                        }
-                                        else
-                                        {
-                                            <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
-                                        }
+                                        //if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/
+                                        //{
+                                            <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
+                                            @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
+                                        //}
+                                        //else
+                                        //{
+                                            @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
+                                        //}
                                     }
                                 }
                             }