From bc224a8ae1ae212026b96c089268a71469191404 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Fri, 7 May 2021 04:39:33 +0000
Subject: [PATCH] =?UTF-8?q?"=EA=B2=B0=EC=A0=9C=EB=B0=A9=EB=B2=95=20?=
 =?UTF-8?q?=EB=AC=B4=ED=86=B5=EC=9E=A5=EC=9E=85=EA=B8=88(=EA=B0=80?=
 =?UTF-8?q?=EC=83=81=EA=B3=84=EC=A2=8C)=20=EC=9D=BC=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=20=ED=98=84=EA=B8=88=EC=98=81=EC=88=98=EC=A6=9D/=EA=B3=84?=
 =?UTF-8?q?=EC=82=B0=EC=84=9C=20=EB=B0=9C=ED=96=89=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 미발행 제거
2. 온라인/혼합 : 현금영수증
3. 오프라인&환급 : 계산서
4. 오프라인&비환급&개인 : 현금영수증
5. 오프라인&비환급&업체 : 현금영수증 or 계산서 선택 "
---
 Dao/MyBatis/Maps/Pay.xml        |  4 +--
 FO/Views/Course/ApplyPay.cshtml | 51 ++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index e5564ae..0847d9b 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -900,7 +900,7 @@
             where payno=#payno# and isunpay=1;
         </update>
         <select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog">
-          select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation
+          select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation,a.cshape
           ,b.payno,b.pstatus
           ,a2.infee,a2.accommofee
           ,b.isbill
@@ -929,7 +929,7 @@
             where a.cmno=#cmno# and a.isready=1 and a.status=6
         </select>
         <select id="pay.pplogs.bypay" parameterClass="hashtable" resultClass="pplog">
-            select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation
+            select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation,a.cshape
                 ,b.payno,b.pstatus
             from pay b
             inner join pplog a on a.pplno=b.pplno
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index d83dd8b..cff45da 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -91,31 +91,33 @@
             <li><input type="radio" name="ptype" id="pay0101" value="6" checked><label for="pay0101">무료</label></li>
         }
     </ul>
-    <div id="cashbox" style="display:none">
-        <h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4>
+    <div id="cashbox" style="display:none">        
+        <h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4> 
         <ul class="apyRdo">
-            <li><input type="radio" name="iscashrct" id="pay0201" value="0"><label for="pay0201">미발행</label></li>
-            <li>
-                <input type="radio" name="iscashrct" id="pay0202" value="1"><label for="pay0202">현금영수증 발행<span class="cashnot hide"> (핸드폰번호 :</span></label>
-                <ul class="apyPh cashnot hide">
-                    <li>
-                        <select id="hp1">
-                            <option value="">선택</option>
-                            <option value="010">010</option>
-                        </select>
-                    </li>
-                    <li>-</li>
-                    <li><input type="tel" id="hp2" maxlength="4" /></li>
-                    <li>-</li>
-                    <li><input type="tel" id="hp3" maxlength="4" /></li>
-                </ul>
-                <span class="cashnot hide">)</span>
-            </li>
-            @if (!string.IsNullOrEmpty(Model.PPLog.asname))
+            @if ((Model.PPLog.cshape != 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0))
+            {
+                <li>
+                    <input type="radio" name="iscashrct" id="pay0202" value="1"><label for="pay0202">현금영수증 발행<span class="cashnot hide"> (핸드폰번호 :</span></label>
+                    <ul class="apyPh cashnot hide">
+                        <li>
+                            <select id="hp1">
+                                <option value="">선택</option>
+                                <option value="010">010</option>
+                            </select>
+                        </li>
+                        <li>-</li>
+                        <li><input type="tel" id="hp2" maxlength="4" /></li>
+                        <li>-</li>
+                        <li><input type="tel" id="hp3" maxlength="4" /></li>
+                    </ul>
+                    <span class="cashnot hide">)</span>
+                </li>
+            }
+            @if ((Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0 && !String.IsNullOrEmpty(Model.PPLog.asname)))
             {
                 <li><input type="radio" name="iscashrct" id="pay0203" value="2"><label for="pay0203">계산서 발행</label></li>
-            }
-         </ul>
+            } 
+        </ul>
     </div>
     <ul class="clsBtn society">
         <li><a href="#" onclick="save()">수강신청</a></li>
@@ -163,6 +165,9 @@
             $("#cashbox").hide();
             if ($(this).val() == 3) {
                 $("#cashbox").show();
+                if ($("input[name='iscashrct']").length == 1) {
+                    $("input[name='iscashrct']").click();
+                }
             }
         });
         $("input[name='iscashrct']").on("change", function () {
@@ -190,7 +195,7 @@
         if ($("input[name='ptype']:checked").length < 1) {
             msg("결제방법을 선택해주세요.");
         } else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").length < 1) {
-            msg("현금영수증 발행여부를 선택해주세요.");
+            msg("현금영수증 / 계산서 발행여부를 선택해주세요.");
         } else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").val() == 1 && !ismobilenumber($("#cashrcthp").val())) {
             msg("현금영수증 발행 핸드폰번호를 올바르게 입력해주세요.");
         }