From d2f6726931fb0425139913e3908ec8b9d45e75e7 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Tue, 8 Dec 2020 01:18:12 +0000 Subject: [PATCH] --- BO/obj/Debug/BO.csprojAssemblyReference.cache | Bin 29081 -> 15527 bytes .../Debug/Base.csprojAssemblyReference.cache | Bin 48410 -> 8781 bytes Dao/MyBatis/Maps/Lect.xml | 2 +- .../Debug/Dao.csprojAssemblyReference.cache | Bin 26345 -> 4091 bytes FO/Controllers/FOBaseController.cs | 5 +- FO/Controllers/MyController.cs | 5 + FO/FO.csproj | 10 ++ FO/Views/Account/Join.cshtml | 6 +- FO/Views/CDMS/Contents.cshtml | 2 +- FO/Views/Course/SmartSearch.cshtml | 8 +- FO/Views/Home/Index.cshtml | 8 +- FO/Views/My/Document.cshtml | 45 ++++++-- FO/Views/My/MyAssInfo.cshtml | 10 +- FO/Views/My/MyInfoCheck.cshtml | 2 +- FO/Views/My/PayInfo.cshtml | 107 ++++++++++-------- FO/Views/Shared/Partial/Foot.cshtml | 1 + FO/Views/Shared/_Layout.cshtml | 3 + FO/css/style.css | 7 +- Model/CM.cs | 1 + 19 files changed, 140 insertions(+), 82 deletions(-) diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index a3e1abc92b834bd09696905b3b3e4a1daed25d74..95ff005d30025fdb6e08d54d674c3b2e4b5037da 100644 GIT binary patch literal 15527 zcmeI3Uu+yl9mj9(Ztrf^Nu5+Q=|8|Jr4(Y$Hny9@B2Ch>O-y6Qj)NPB6SH@>cV2t% zPj~m6UTBmyRUr|yRsSHM6%bSeFRg?C33zE=S_uIUAc4dqyzo>Wc;yAY-<{jb+Ixi< z`p`=IllFJJb2Go0o%zhn?#yo!B9Tb^3&LN@jwICiS*zqU+(yOAKh(19a{jd8uDkg{ z!!ZX3mQ2UB8uh~?h2urn9#E#krZn>8a(15NEk))t4vDVyn75H=k!nzHHmOn3Z3G98NT<{r|O+ z_fH2EtRsG^)+ncOtS60nx@t)n%&|ms3gEC!cIO~~y1SK@4-qvm0 z%2ca{du%RUhpA+9J=I+IQm8JiVjERATWYopr?kpAg_&f@%Hm}8m|c~K;=|+RN{zBv zL@Q?3&34nU9L;bSJtu3qi>xu7DVwchFe0s5t>pusbIh92Y?|eSNM=b}B9#(JRzOlD zw^UIsCvxN6-czqw)s|zh0|gCZnQm~}KCVjFa4c`N_Su_F)oBcMKUUGQEw3$v@Ea_% z3#H0-K-J}LTuIg%g#{Luq0)cHAoRZ#k~Xp%?4v6yiCp>#7<&iC{=c$svdJ7Ww?PfF zH%tr-4NXoAp-&E}J~_l5ID|eqLcV^sH2eVpn(s!veePxVQv zPeJWwhohv~$F@MoAuzKtYpgXK{8$+7GAsV%B3DkC8x}_dCe1p+`2M!qHrSS(w4vmhP!v_y(tg>xY^!sQmNG93p>G#oC z@N>~^o*NVR=ghk4SS5cVUo^chkDNWbohe~(U~BC6_DSX3IdY{&u|b^WYHq3F*j7=O zpT?!kLj~dwW8x3sl|var#qV*#p@_8Vx<4n4;8bHbjKQ+2@69ChK?mzIpdp7DVir#U zwk}6;DaW7!QDFTx4AyU=U>!hojYE43Rt%OJu?~WUU>1JFEaqo7O1eCRKsf;wh{Egb zFkWv(@j8s?8Xp>Bykfi*UJrtXy)y;A<24HyyYl|om#pRq&W}g%uRIDBh~n(cFlTQ> zIV&K##^=(QvzRl**(7MlV1Ar58oHdqg`9>8L}B%-Fjl{eVl{*48sBtctYWMbR-XqA zdgqk{v!gB_Mu0p46^KIXXJNE{8b#|QqHBDAj?s$IQfSSChKxc>mkYR%r=S8+SiK&` z>a{3VUqEz?D>5-wF;)tzCD72<8L=h}&(P%~2$5%?0#R)JILy|MqHLW-bd3vrF1rdob}v*+S4@|p>mq3A?>x-|t^9G%YwGeV2$hdR z1)}(RD$LiFC|{QmU8Cbi%va2p;_C^}pwG4!AGNV6&xMF55g@NX1)|Wp6h`auC|XY= zx<+@R7_AsBh1OR=Lw4a5HxwORehpXhDpVkfs|#VSHlkd89nm#=WKE`;(cqzPIAQE%){vP#a7l5b;=l+Y5?tku8sMTPB`LVF+4J7HfEi85)ha*dZu@iTs;2?2 zP(=+q85nqb_42Q;S#QmXD;)zF{PMop2PlH;5K#ks`J^PpRcPkS`{ljT07dXcGn()j zgl;Z6-!Xa?{rR2-_ykEw3O+^#Ir~8!CHS-$&6!UIn{(!4LeHG}G!Qkw@!mJk9WbtU y3VkQgOT%>e9wMcG9Ha%+QtX!0Kd+jT% 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 literal 48410 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 CWjr?k diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs index de0cf40..98f27e3 100644 --- a/FO/Controllers/FOBaseController.cs +++ b/FO/Controllers/FOBaseController.cs @@ -316,10 +316,11 @@ namespace NP.FO.Controllers } sb2.Append(""); sb2auth.Append(""); - sbmauth.Append(string.Format("
  • {0}
      ", m.pagename, m.pno)); + var menu = GetMENUPAGES.Where(w => w.pdepth == 1 && w.isopen == 1 && w.ppno == m.pno && w.pagetype != 4).FirstOrDefault(); + sbmauth.Append(string.Format("
    • {0}
        ", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl)); if (m.usertype == 0) { - sbm.Append(string.Format("
      • {0}
          ", m.pagename, m.pno)); + sbm.Append(string.Format("
        • {0}
            ", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl)); } foreach (var m2 in GetMENUPAGES.Where(w => w.pdepth == 1 && w.isopen == 1 && w.ppno == m.pno && w.pagetype != 4)) { diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index cf7d13e..d0e5378 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -243,6 +243,9 @@ namespace NP.FO.Controllers { return Redirect("/My/Paies"); } + vm.Pay.mid = (("test".Equals(GetConfig("CST_PLATFORM").Trim())) ? "t" : "") + GetConfig("CST_MID"); + + String authdata = vm.Pay.mid + vm.Pay.pgkey + GetConfig("LGD_MERTKEY"); vm.PayItems = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }); vm.PayItem = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }).FirstOrDefault(); vm.intval3 = Dao.Get("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno }/*,{ "rstatus", 0}*/, { "withoutrstatus" , "4" } }).Count(); @@ -425,6 +428,8 @@ namespace NP.FO.Controllers public ActionResult Document(VMMy vm) { ViewBag.reporturl = GetConfig("reporturl"); + ViewBag.mid = (("test".Equals(GetConfig("CST_PLATFORM").Trim())) ? "t" : "") + GetConfig("CST_MID"); + ViewBag.mertkey = GetConfig("LGD_MERTKEY"); if (vm.tabidx == 0) { vm.pagerowcount = vm.pagerowcount < 1 ? 10 : vm.pagerowcount; diff --git a/FO/FO.csproj b/FO/FO.csproj index b403f3c..90de76c 100644 --- a/FO/FO.csproj +++ b/FO/FO.csproj @@ -347,6 +347,15 @@ + + + + + + + + + @@ -456,6 +465,7 @@ + diff --git a/FO/Views/Account/Join.cshtml b/FO/Views/Account/Join.cshtml index c0b705f..bac03cd 100644 --- a/FO/Views/Account/Join.cshtml +++ b/FO/Views/Account/Join.cshtml @@ -221,7 +221,7 @@ else } function onGoogleLogIn(googleUser) { - if (@Request["jointype"] == "1") { + if ("@(Request["jointype"])" == "1") { var profile = googleUser.getBasicProfile(); $("#username").val(profile.getName()); $("#email").val(profile.getEmail()); @@ -235,7 +235,7 @@ else } function snsLogin() { - if (@Request["jointype"] == "2") { + if ("@(Request["jointype"])" == "2") { var naverLogin = new naver.LoginWithNaverId( { clientId: "@naverClientId", @@ -277,7 +277,7 @@ else } }); } - if (@Request["jointype"] == "3") { + if ("@(Request["jointype"])" == "3") { $.when( Kakao.init("@kakaoClientId"), ).done(function () { diff --git a/FO/Views/CDMS/Contents.cshtml b/FO/Views/CDMS/Contents.cshtml index 4eddcf8..d5810ee 100644 --- a/FO/Views/CDMS/Contents.cshtml +++ b/FO/Views/CDMS/Contents.cshtml @@ -41,7 +41,7 @@ //{ //} - + } else if (Model.CMInning.ctype == 2) { diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 1a10788..8c511d8 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -7,8 +7,8 @@ @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") {
            • @@ -39,8 +39,8 @@ else if (Model.stringval == "1") {
              • diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index e74a806..ff0ada6 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -72,8 +72,8 @@ @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") {
                  @@ -162,8 +162,8 @@ else if (Model.stringval == "1") {
                  • diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index 822f273..f6d092b 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -1,9 +1,17 @@ @model NP.Model.VMMy
                      @@ -55,7 +63,7 @@ @if (item.pstatus == 1) { - [인쇄] +
                      인쇄                       } else { @@ -63,12 +71,12 @@ } - [인쇄] +
                      [인쇄]                       @if (item.iscomplete == 1) { - [인쇄] +
                      [인쇄]                       } else { @@ -76,21 +84,23 @@ } - @if(item.pstatus == 1) + @if (item.pstatus == 1) { - if (item.ptype == 6) + if (item.ptype == 6) { @Html.Raw("-") - }else if(item.ptype == 1 && item.ispg == 1) + } + else if (item.ptype == 1 && item.ispg == 1) { [카드사 매출전표] - }else if(item.ptype == 3 && item.ispg == 1) + } + else if (item.ptype == 3 && item.ispg == 1) { [서마터빌] } else { - if(item.taxno > 0) + if (item.taxno > 0) { [@(item.taxdate == null ? "신청중" : "발행")] } @@ -130,5 +140,18 @@ msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요."); } } + function viewtax(pgkey) { + showReceiptByTID('@(ViewBag.mid)', pgkey, @(ViewBag.mid)+pakey+@(ViewBag.mertkey)); + } + @if (ViewBag.isPayTest == "1") + { + //테스트일 경우 + + } + else + { + //서비스일 경우 + + } } \ No newline at end of file diff --git a/FO/Views/My/MyAssInfo.cshtml b/FO/Views/My/MyAssInfo.cshtml index 9c9dadd..5cbcf42 100644 --- a/FO/Views/My/MyAssInfo.cshtml +++ b/FO/Views/My/MyAssInfo.cshtml @@ -55,11 +55,11 @@
                    • -
                      • diff --git a/FO/Views/My/MyInfoCheck.cshtml b/FO/Views/My/MyInfoCheck.cshtml index e2bda4b..b368aca 100644 --- a/FO/Views/My/MyInfoCheck.cshtml +++ b/FO/Views/My/MyInfoCheck.cshtml @@ -75,7 +75,7 @@ @if (!string.IsNullOrEmpty(u.birthday)) { -

                      u.birthday.Replace("-", ".")

                      +

                      @(u.birthday.Replace("-", "."))

                      } diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index 6a1f48e..c4b2d0d 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -4,7 +4,7 @@ }

                      주문상품 정보

                      @@ -37,24 +37,24 @@ { 입금계좌@Model.Pay.vactbankname | @Model.Pay.vactnum | @Model.Pay.vactname } - - 주문접수일 - @if (Model.Pay.paylimit != null && Model.PayItem.retime != null) + + 주문접수일 + @if (Model.Pay.paylimit != null && Model.PayItem.retime != null) + { + if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) { - if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) - { - @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "") - } - else - { - @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "") - } + @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "") } else { - @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") + @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "") } - + } + else + { + @Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") + } + 주문상태 @Model.Pay.pstatusname @Html.Raw(Model.Pay.ispg == 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype == 1 ? "영수증 출력" : "") @@ -96,40 +96,40 @@ } -
                        -
                      • 결제현황 이동
                        • - @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1 && Model.Pay.ptype != 6) +
                          +
                        • 결제현황 이동
                          • + @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1 && Model.Pay.ptype != 6) + { + if (Convert.ToDateTime(Convert.ToDateTime(Model.Pay.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-10"))) { - if (Convert.ToDateTime(Convert.ToDateTime(Model.Pay.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-10"))) - { -
                        • 계산서요청
                          • - } - else - { -
                        • 계산서요청
                          • - } +
                        • 계산서요청
                          • } - @if (Model.Pay.pstatus == 1 && Model.Pay.rstatus != 2 && Model.PayItems.Where(w => w.rstatus == 0).Count() > 0) + else { - if (Model.intval3 > 0 && Model.PayRfd != null && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 2)) - { -
                          • - } - else if (Model.intval3 > 0 && Model.PayRfd != null && Model.PayRfd.rstatus == 1) - { -
                        • 환불요청
                          • - } - else - { -
                        • 환불요청
                          • - } +
                        • 계산서요청
                          • + } + } + @if (Model.Pay.pstatus == 1 && Model.Pay.rstatus != 2 && Model.PayItems.Where(w => w.rstatus == 0).Count() > 0) + { + if (Model.intval3 > 0 && Model.PayRfd != null && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 2)) + { +
                          • + } + else if (Model.intval3 > 0 && Model.PayRfd != null && Model.PayRfd.rstatus == 1) + { +
                        • 환불요청
                          • + } + else + { +
                        • 환불요청
                          • + } - } - @if (Model.Pay.rstatus < 2 && Model.Pay.pstatus == 22) - { -
                        • 결제취소
                          • - } -
                        + } + @if (Model.Pay.rstatus < 2 && Model.Pay.pstatus == 22) + { +
                      • 결제취소
                        • + } +
                    diff --git a/FO/Views/Shared/_Layout.cshtml b/FO/Views/Shared/_Layout.cshtml index 903aa79..cb8e4ce 100644 --- a/FO/Views/Shared/_Layout.cshtml +++ b/FO/Views/Shared/_Layout.cshtml @@ -48,6 +48,9 @@ var _ismain = 1; $("li.topsubmenu@(ViewBag.MenuPage.m1)").addClass("current"); $("li.topmenu@(ViewBag.MenuPage.m0)").addClass("current"); + $(document).ready(function () { + $('a:contains("마이페이지")').css("color", "#0070C0"); + }); \ No newline at end of file diff --git a/FO/css/style.css b/FO/css/style.css index 467a170..efdfd83 100644 --- a/FO/css/style.css +++ b/FO/css/style.css @@ -2371,8 +2371,10 @@ span.org {color: #ff5a00;} .tchCont {margin-top: 30px;} .tchCont h4 {height: 60px; line-height: 58px; text-align: center; border: solid 1px #d6d6d6; font-size: 16pt; font-weight: 500;} .tchCont h4 span {font-weight: 300; font-size: 13pt;} +.tchCont > img {width: 27%; display: inline-block; margin:30px 1%; vertical-align:top;} +.tchCont > ul {width: 70%; display: inline-block;} .tchCont > ul:after {content: ''; display: table; clear: both;} -.tchCont > ul > li {margin-top: 30px; float: left; width: 50%; position: relative; padding-left: 170px;} +.tchCont > ul > li {margin-top: 30px; position: relative; padding-left: 170px;} .tchCont > ul > li > h5 {width: 150px; height: 50px; line-height: 50px; text-align: center; background: #f9f9f9; font-size: 12pt; font-weight: 500; position: absolute; left: 0; top: 0;} .tchCont > ul > li > ul {min-height: 50px;} .tchCont > ul > li > ul > li {position: relative; padding-left: 8px; font-size: 11pt; color: #666; margin-bottom: 5px;} @@ -2539,7 +2541,8 @@ span.org {color: #ff5a00;} .inRulCnt {display: block; height: auto;} .inRulCnt > div {display: block; padding: 10px;} - + .tchCont > img {margin-top: 15px; width:37%;} + .tchCont > ul {width: 60%;} } diff --git a/Model/CM.cs b/Model/CM.cs index 930cdb1..a45c061 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -1102,6 +1102,7 @@ namespace NP.Model return (estart != null && estart > Convert.ToDateTime("1900-01-01")) ? estart.ToShortDateString() : ""; } } + public String pgkey { get; set; } } /// /// 자격검정시험