<기능개선>

1. 추가개발 PPT 내용 1-13번 진행 (pms : 6646)
2. smartsearch / 와 my/index에 있었던 오류 해결 과 기능개선과 문구수정 팝업내용 진행 완료

FO/Views/Course/SmartSearch.cshtml

@@ -427,7 +427,7 @@
             }
 
             // 교육장소 생성하기
-            if (/*cshape != 2 &&*/  strStudyPlaceTag != '') {
+            if (cshape > 0 &&  strStudyPlaceTag != '') {
                 divPlace.append(strStudyPlaceTag);
                 divPlace.show();
             }
@@ -441,16 +441,8 @@
 
         var ulScd = $("#ulScd" + cmno);
         ulScd.empty();
-
-
         //var seq = 0;
-        //2022-08-31 cshape == 1 교육장교육일때 cshape == 2 온라인교육일때
+        if (capResult.obj.length < 1) {
-        if (cshape == 1) {
-            var li = $("<li />");
-            li.append("<label> - 선택 가능한 교육일정이 없습니다.</label>");
-            ulScd.append(li);
-        }
-        else if (cshape == 2) {
             var li = $("<li />");
             li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
             ulScd.append(li);

FO/Views/My/Document.cshtml

@@ -103,19 +103,19 @@
                                     }
                                     else
                                     {
-                                        var isAllDays = (item.retime == null ? String.Empty : Convert.ToDateTime(item.retime).ToString("yyyy-MM-dd")) == "2099-12-31";
+                                       @* var isAllDays = (item.retime == null ? String.Empty : Convert.ToDateTime(item.retime).ToString("yyyy-MM-dd")) == "2099-12-31";
                                         if (isAllDays)
-                                        {
+                                        {*@
                                             if (item.cshape == 1)
                                             {
                                                 <dt class="lectstatus">@item.lectStatus</dt>
                                                 @*if (item.pstatus != 22)
                                                     {*@
-                                                <dd>교육기간 :@arrEduTerm[2]</dd>
+                                                <dd>교육기간 : @arrEduTerm[2]</dd>
                                                 <dt></dt>
                                                 @*}*@
-                                                <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                                           @*     <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
-                                                <dt></dt>
+                                                <dt></dt>*@
                                                 <dt>@item.studytime 시간과정</dt>
 
                                                 @Html.Raw(item.isrebate == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
@@ -126,7 +126,7 @@
                                                 <dt class="lectstatus">@item.lectStatus</dt>
                                                 @* if (item.pstatus != 22)
                                                     {*@
-                                                <dd>교육기간 :@arrEduTerm[2]</dd>
+                                                <dd>교육기간 : @arrEduTerm[2]</dd>
                                                 <dt></dt>
                                                 @*}*@
                                                 <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
@@ -136,7 +136,7 @@
                                                 @Html.Raw(item.isrebate == 1 ? "<span class=\"red\" style='vertical-align: middle;'>환급과정</span>" : "<span class=\"red\" style='vertical-align: middle;'>비환급과정</span>")
 
                                             }
-                                        }
+                                        @*}*@
 
                                     }
                                 </dl>
@@ -144,7 +144,7 @@
                         </div>
                     </th>
                     <td class="ltaBtn" data-th="위탁계약서 : ">
-                        @if (item.pstatus == 1 && item.isrebate == 1 && item.status == 1)
+                        @if ((item.pstatus == 1 || item.pstatus == 22)&& item.isrebate == 1 && (item.status == 1 || item.status == 2))
                         {
                             <a href="#" onclick="javascript: educontract(@(item.lectno));"><img src="~/img/mypage/print.png"><br />인쇄</a>
                         }

FO/Views/My/Index.cshtml

@@ -165,7 +165,7 @@
                             }
                             @*<a href="@(d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 1 ? "/CRoom/Index?croomlectno=" + d.longval : d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 0
                                 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 51 ? "/Course/ApplyPay" : d.intval5 != 1 && d.intval4 == 21 ? "/Course/ApplyPay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)" class="gocroom">*@
-                            <a href="/MY/Paies" onClick="alert('감사합니다')" data-cshape=@d.intval3 class="gocroom">
+                            <a href="#" onclick="gopaies1()" data-cshape=@d.intval3 class="gocroom">
                                 <h5>
                                     <span class="@(d.intval3 == 0 ? "org" : d.intval3 == 1 ? "nav_grn" : "nav_blu")">@(d.intval3 == 0 ? "온라인교육" : d.intval3 == 1 ? "교육장교육" : "온라인교육")</span>
                                     @if (d.studyplace == null)
@@ -349,5 +349,8 @@
                 }, 500);
             }
         }
+        function gopaies1() {
+            msg("결제관리 메뉴로 이동합니다.", null, null, null, "location.href='" + '/My/Paies?intval=999' + "'");
+        }
     </script>
 }

FO/Views/My/Lecture.cshtml

@@ -96,7 +96,7 @@
     }
     else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0)
     {
-                <a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno"  data-cshape=@d.cshape class="gocroom">입장</a>
+                <a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno"  data-cshape=@d.cshape class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:40px;">입장</a>
     }
     else
     {

FO/Views/My/Paies.cshtml

@@ -51,25 +51,26 @@
 	</tr>
 	<tr class="payTdetail">
 		<td colspan="2">
-			<ul>
+            <ul>
                 <li>결제방법 : @d.ptypename (@(d.ispg == 1 ?"PG" : "현장"))</li>
-    @if (d.rstatus > 0)
+                @if (d.rstatus > 0)
-    {
+                {
-                <li>환불금액 : <span>@(d.refundamt.ToString("#,0"))원</span>(@d.rstatustime.Value.ToString("yyyy.MM.dd HH:mm"))</li>
+                    <li>환불금액 : <span>@(d.refundamt.ToString("#,0"))원</span>(@d.rstatustime.Value.ToString("yyyy.MM.dd HH:mm"))</li>
-    }
+                }
-    else if (d.pstatus == 22)
+                else if (d.pstatus == 22)
-    {
+                {
-                <li>입금방법 : @d.vactbankname / @d.vactnum  (만료일 : @(d.paylimit.Value.ToString("yyyy.MM.dd HH:mm")))</li>
+                    @*<li>입금방법 : @d.vactbankname / @d.vactnum  (만료일 : @(d.paylimit.Value.ToString("yyyy.MM.dd HH:mm")))</li>*@
-    }
+                    <li>입금방법 : @d.vactbankname / @d.vactnum </li>
-    else if (d.pstatus != 1)
+                }
-    {
+                else if (d.pstatus != 1)
-                <li>결제취소</li>
+                {
-    }
+                    <li>결제취소</li>
-    @if (d.isdvr == 1)
+                }
-    {
+                @if (d.isdvr == 1)
-                <li>배송방법 : <a href="#" onclick="viewdvr(@(d.isdvr2), '@(d.dvrcode??"")')">@(d.isdvr2==0?"방문수령":"택배") (@Html.Raw(d.isdvr2 == 0 ? string.IsNullOrEmpty(d.dvrcode)?"미수령" : "수령완료" : string.IsNullOrEmpty(d.dvrcode)?"배송대기중": "<span>배송됨</span>"))</a></li>
+                {
-    }
+                    <li>배송방법 : <a href="#" onclick="viewdvr(@(d.isdvr2), '@(d.dvrcode??"")')">@(d.isdvr2==0?"방문수령":"택배") (@Html.Raw(d.isdvr2 == 0 ? string.IsNullOrEmpty(d.dvrcode) ? "미수령" : "수령완료" : string.IsNullOrEmpty(d.dvrcode) ? "배송대기중" : "<span>배송됨</span>"))</a></li>
-			</ul>
+                }
+            </ul>
 		</td>
 	</tr>
 </table>

FO/Views/My/Ready.cshtml

@@ -51,7 +51,7 @@
             <tr>
                 <th>
                     <div class="ltaList">
-                        <a href="#" style="cursor: default">
+                        <a href="#" style="cursor: default" onclick="gopaies()">
                             <h5>
 
                                 <span class="@(d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu")">@d.cshapename</span>
@@ -145,7 +145,9 @@
 }
 @section scripts{
     <script>
-          
+        function gopaies(pstatus) {
+            msg("결제관리 페이지로 이동합니다.", null, null, null, "location.href='" + '/My/Paies?intval=999' + "'");
+        }
         $(document).ready(function () {
             $('.ltaOpen').click(function () {
                 var atdNum = $(this).attr('ltaOpen');

FO/css/mypage.css

@@ -265,7 +265,7 @@
 .lctAply thead {}
 .lctAply thead th,
 .lctAply thead td {border-top:solid 1px #d6d6d6; border-bottom:solid 1px #d6d6d6; background:#f9f9f9; text-align:center; font-size:12pt; font-weight:300; padding:13px;}
-.lctAply thead td {width:100px;}
+.lctAply thead td {width:95px;}
 .lctAply tbody th,
 .lctAply tbody td {border-top:solid 1px #d6d6d6; border-bottom:solid 1px #d6d6d6;}
 .lctAply tbody th {text-align:left;}