From 990b79a85fddbcb32f63d8ac123b54c995e9acf2 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Tue, 11 May 2021 07:35:42 +0000
Subject: [PATCH] =?UTF-8?q?lms=EC=97=90=EC=84=9C=20=ED=98=84=EA=B8=88?=
 =?UTF-8?q?=EC=98=81=EC=88=98=EC=A6=9D=20=EC=84=A0=ED=83=9D,=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=EC=97=90=EC=84=9C=20=EB=AF=B8=EB=B0=9C=ED=96=89=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EA=B1=B4=20payvbankin.cshrpgkey(LGD=5FCAS?=
 =?UTF-8?q?HRECEIPTNUM=0910=09=ED=98=84=EA=B8=88=EC=98=81=EC=88=98?=
 =?UTF-8?q?=EC=A6=9D=EC=8A=B9=EC=9D=B8=EB=B2=88=ED=98=B8)=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EC=97=86=EC=9D=84=EB=95=8C=20showCashReceipts=20->?=
 =?UTF-8?q?=20showReceiptByTID(=EA=B2=B0=EC=A0=9C=EA=B1=B0=EB=9E=98=20?=
 =?UTF-8?q?=EC=98=81=EC=88=98=EC=A6=9D=20=EC=B6=9C=EB=A0=A5)=20=ED=98=B8?=
 =?UTF-8?q?=EC=B6=9C=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Controller/FCommonPay.cs   |  2 +-
 Dao/MyBatis/Maps/Lect.xml       |  4 +++-
 FO/Views/Course/ApplyEdu.cshtml |  8 ++++----
 FO/Views/My/Document.cshtml     | 19 +++++++++++++------
 Model/CM.cs                     |  5 ++++-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Base/Controller/FCommonPay.cs b/Base/Controller/FCommonPay.cs
index 062fb5b..a856cb4 100644
--- a/Base/Controller/FCommonPay.cs
+++ b/Base/Controller/FCommonPay.cs
@@ -601,7 +601,7 @@ namespace NP.Base.Controllers
         /// <param name="payno"></param>
         /// <returns></returns>
         [HttpPost]
-        public JsonResult PayTaxinvoiceView(long payno)
+        public JsonResult GetPayTaxinvoicePrintURL(long payno)
         {
             var payTax = Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno", payno } }).Where(w=> w.cno == SUserInfo.UserNo).FirstOrDefault();
             if (payTax != null)
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index a81b8df..06ecb55 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1515,8 +1515,9 @@
             ,cc.ccode studyplace
             ,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel
             ,a.cdt
+            ,pv.cshrpgkey
             ,row_number() over(order by a.cdt desc) rno
-            ,count(a.lectno) over() pagetotalcount            
+            ,count(a.lectno) over() pagetotalcount              
           from lect a
           inner join cm b on b.cmno = a.cmno
           inner join term c on c.tmno = b.tmno
@@ -1538,6 +1539,7 @@
           left outer join cminningscd f on f.cmisno = a.cmisno 
           left outer join comcode cc on cc.ccode = b.studyplace 
           left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0
+          left outer join payvbankin pv on pv.payno = a.payno 
           where a.status=1 and a.ischanged=0
             <isNotNull property="cdts">and a.cdt &gt;= #cdts#</isNotNull>
             <isNotNull property="cdte">and a.cdt &lt;= #cdte#</isNotNull>
diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index cdf9bae..fe24e34 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -131,10 +131,10 @@
                 <tr>
                     <th>업체/개인 선택</th>
                     <td>
-                        <input type="radio" name="isCompany" id="isCompany1" value="1" @(Model.Assign != null ? "checked" : "") /><label for="isCompany1"> 업체</label>
-                        <input type="hidden" name="asno" id="asno" value="@(Model.Assign != null ? Model.Assign.asno : 0)">
-                        <input type="text" id="asname" name="asname" placeholder="" readonly="readonly" value="@(Model.Assign != null ? Model.Assign.asname : "")" style="background-color:#ddd;" />&nbsp;&nbsp;
-                        <input type="radio" name="isCompany" id="isCompany0" value="0" @(Model.Assign != null ? "" : "checked") style="padding-left:5px" /><label for="isCompany0"> 개인</label>
+                        <input type="radio" name="isCompany" id="isCompany1" value="1" @(Model.Assign.asno != 0 ? "checked" : "") /><label for="isCompany1"> 업체</label>
+                        <input type="hidden" name="asno" id="asno" value="@(Model.Assign.asno)">
+                        <input type="text" id="asname" name="asname" placeholder="" readonly="readonly" value="@(Model.Assign.asname)" style="background-color:#ddd;" />&nbsp;&nbsp;
+                        <input type="radio" name="isCompany" id="isCompany0" value="0" @(Model.Assign.asno != 0 ? "" : "checked") style="padding-left:5px" /><label for="isCompany0"> 개인</label>
                     </td>
                 </tr>
             </tbody>
diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml
index 6e26f43..1ee0fb7 100644
--- a/FO/Views/My/Document.cshtml
+++ b/FO/Views/My/Document.cshtml
@@ -117,7 +117,14 @@
                             {
                                 if (item.iscashrct == 1) /*현금영수증신청*/
                                 {
-                                    <a href="#" onclick="viewtaxcash('@(item.payno)')">[인쇄]</a>
+                                    if (!string.IsNullOrEmpty(item.cshrpgkey) && item.cshrpgkey != "0" ) /*세금계산서신청*/
+                                    {
+                                        <a href="#" onclick="viewtaxcash('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))', '@(item.payno)')">[인쇄]</a>
+                                    }
+                                    else
+                                    {
+                                        <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
+                                    }
                                 }
                                 else
                                 {
@@ -394,7 +401,7 @@ else
 }
 @section scripts{
     @Html.Partial("./Partial/ScriptPost")
-    <script>
+<script>
         function certification(lectno) {
             var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
             if (pop == null) {
@@ -429,7 +436,7 @@ else
             showCashReceipts('@(ViewBag.mid)', LGD_OID, seqno, 'CAS', service_type);
         }
         function viewtaxinvoice(payno) {
-            capp('/fcommon/paytaxinvoiceview', { payno: payno }, 'cbviewtaxinvoice');
+            capp('/fcommon/getpaytaxinvoiceprinturl', { payno: payno }, 'cbviewtaxinvoice');
         }
         function cbviewtaxinvoice() {
             if (capResult.code == 1000) {
@@ -464,7 +471,7 @@ else
                 msg("결제완료내역만 계산서요청하실 수 있습니다.");
             }
         }
-        function cbpaytaxget() { 
+        function cbpaytaxget() {
             var h = capResult.obj.h;
             var d = capResult.obj.d;
             if (h != null && d.length > 0) {
@@ -561,7 +568,7 @@ else
                         });
                         $("#tfile").html(file);
                     }
-                    $("input:radio[name='tisreceipt']:radio[value='" + paytax.isreceipt + "']").prop('checked', true); 
+                    $("input:radio[name='tisreceipt']:radio[value='" + paytax.isreceipt + "']").prop('checked', true);
                     $("#pop2").fadeIn("fast", function () {
                         $(".pop2box").scrollTop(0);
                     });
@@ -578,7 +585,7 @@ else
                 $("#dform").submit();
             }
         }
-    </script>
+</script>
     @if (ViewBag.isPayTest == "1")
     {
         //테스트일 경우
diff --git a/Model/CM.cs b/Model/CM.cs
index 44400c7..ce3d21e 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -1205,7 +1205,10 @@ namespace NP.Model
         /// 발행취소	0:정상, 1:취소
         /// </summary>
         public int iscancel { get; set; }
-
+        /// <summary>
+        /// 현금영수증 발급 TID 가상계좌 채번시 현금영수증자동발급 설정을 한 거래건에한해 전달
+        /// </summary>
+	    public String cshrpgkey { get; set; }
     }
     /// <summary>
     /// 자격검정시험