From c866fc500a097702dd2a09193efd03bbf2c1b494 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Tue, 11 May 2021 01:23:35 +0000
Subject: [PATCH] =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=A7=84=EC=9E=85=20?=
 =?UTF-8?q?=EC=8B=9C=20=ED=99=98=EA=B8=89=EC=97=AC=EB=B6=80=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=EC=97=90=20'=ED=99=98=EA=B8=89'=20=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EA=B8=B0=EB=B3=B8=EA=B0=92=20=EC=84=A4=EC=A0=95=EB=90=98?=
 =?UTF-8?q?=EC=96=B4=20=EC=9E=88=EC=9C=BC=EB=82=98=20=ED=9A=8C=EC=82=AC?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=9E=85=EB=A0=A5=EC=B9=B8=EC=9D=B4=20?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A=EC=9D=8C.=20=ED=99=98?=
 =?UTF-8?q?=EA=B8=89=EC=97=AC=EB=B6=80=EB=A5=BC=20=EB=B9=84=ED=99=98?=
 =?UTF-8?q?=EA=B8=89=20=EC=84=A0=ED=83=9D=ED=96=88=EB=8B=A4=EA=B0=80=20?=
 =?UTF-8?q?=ED=99=98=EA=B8=89=20=EC=84=A0=ED=83=9D=ED=95=B4=EC=95=BC=20?=
 =?UTF-8?q?=ED=9A=8C=EC=82=AC=EC=A0=95=EB=B3=B4=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=B9=B8=EC=9D=B4=20=EB=B3=B4=EC=9E=84=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EC=A7=84=EC=9E=85=20=EC=8B=9C=20=EB=B0=94=EB=A1=9C=20=ED=9A=8C?=
 =?UTF-8?q?=EC=82=AC=EC=A0=95=EB=B3=B4=20=EC=9E=85=EB=A0=A5=EC=B9=B8?=
 =?UTF-8?q?=EC=9D=B4=20=EB=B3=B4=EC=9D=BC=20=EC=88=98=20=EC=9E=88=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FO/Views/Course/ApplyEdu.cshtml | 31 ++++++++++++++-----------------
 FO/Views/Course/ApplyPay.cshtml |  1 +
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index 63cfa3a..cdf9bae 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -132,7 +132,7 @@
                     <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.asno">
+                        <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>
                     </td>
@@ -401,8 +401,8 @@
     model.cm = @Html.Raw(Json.Encode(new List<NP.Model.CM>() { Model.CM }.Select(s => new { s.infee, s.accommofee, s.applicableCM, s.cshape, s.cmno }).First()));
     model.assign = @Html.Raw(Json.Encode(new List<NP.Model.Assign>() { Model.Assign }.Select(s => new { s.asno, s.asname }).First()));;
     model.pplog = @Html.Raw(Json.Encode(new List<NP.Model.PPLog>() { ( Model.PPLog != null ? Model.PPLog : new NP.Model.PPLog {}) }.Select(s => new { s.isrebate, s.isaccommodation, s.cmisno }).First()));;
-    model.selMonth = @Model.selMonth;
-    model.iscompany = @Model.isCompany;
+    model.selMonth = @(Model.selMonth != null ? Model.selMonth.ToString() : "null");
+    model.iscompany = @(Model.isCompany != null ? Model.isCompany.ToString() : "null"); 
 
 
     $(document).ready(function () {
@@ -416,7 +416,6 @@
                 $(".div-rbankInfo").show();
                 $(".div-companyInfo").show();
                 $(".uduty").show();
-
             }
             else {
                 $(".div-isCompany").show();
@@ -424,7 +423,7 @@
                 if ($("input:radio[name='isCompany']:checked").val() == "0") {
                     $(".div-companyInfo").hide();
                 }
-                $(".uduty").hide();
+                $(".uduty").hide(); 
             }
         });
 
@@ -443,20 +442,15 @@
             if ($(this).val() == "0") {
                 $("#asno").val("");
                 $("#asname").val("");
-                $(".div-companyInfo").hide();
-                if (model.cm.cshape == 1) {
-                    $("#asname").hide();
-                }
+                $(".div-companyInfo").hide(); 
             } else {
                 if (model.cm.cshape == 1) {
                     $(".div-companyInfo").show();
-                    $("#asname").hide();
-                }  
-                if (model.isloaded) {
-                    if (model.cm.cshape != 1) {                       
-                        boxassignview();
+                } else {
+                    if (model.isloaded) {
+                        boxassignview(); 
                     }
-                }
+                }                
             }
         });
 
@@ -491,6 +485,7 @@
             $(".div-companyInfo").show();
             $(".div-isCompany").hide();
             $(".uduty").show();
+            $("#asname").hide();
         } else if (model.cm.cshape == 2) {
             $(".div-companyInfo").hide();
             $(".div-isCompany").show();
@@ -505,11 +500,13 @@
             $("input:radio[name='isrebate'][value='" + model.pplog.isrebate + "']").click();
         }
 
-        if (model.selMonth != 0) {
+        if (model.selMonth != null) {
             $("#selMonth").val(model.selMonth).trigger('change');
         }
 
-        $("input:radio[name='isCompany'][value='" + model.iscompany + "']").click();
+        if(model.iscompany != null) {
+            $("input:radio[name='isCompany'][value='" + model.iscompany + "']").click();
+        }
 
         if (model.assign.asno == 0) {
             $("#btnassign").show();
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 6f4b316..b9f820d 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -26,6 +26,7 @@
     <input type="hidden" name="cmisno" id="cmisno" />
     <input type="hidden" name="isrebate" id="isrebate" />
     <input type="hidden" name="applicableCM" id="applicableCM" />
+    <input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
     <h4 class="clsTitle">신청강좌</h4>
     <ul class="smtList mt0">
         <li>