From 80777e7b10717b9cb256ff8528e995368a13756c Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Tue, 8 Dec 2020 23:54:54 +0000
Subject: [PATCH]

---
 BO/obj/Debug/BO.csprojAssemblyReference.cache | Bin 15527 -> 54655 bytes
 Base/Controller/FCommonPay.cs                 |  24 +-
 .../Debug/Base.csprojAssemblyReference.cache  | Bin 8781 -> 48897 bytes
 Dao/MyBatis/Maps/Lect.xml                     |  17 +-
 Dao/MyBatis/SqlMapStaging.config              |   2 +-
 .../Debug/Dao.csprojAssemblyReference.cache   | Bin 4091 -> 26345 bytes
 FO/Views/My/Document.cshtml                   | 280 +++++++++++++++++-
 Model/CM.cs                                   |   9 +
 8 files changed, 323 insertions(+), 9 deletions(-)

diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache
index 95ff005d30025fdb6e08d54d674c3b2e4b5037da..3cc7d20d6243bad1c26861b8a1eacbe5043b41a0 100644
GIT binary patch
literal 54655
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
LVo>VE2=)FK&g<iX

literal 15527
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

diff --git a/Base/Controller/FCommonPay.cs b/Base/Controller/FCommonPay.cs
index 95ab813..105e1db 100644
--- a/Base/Controller/FCommonPay.cs
+++ b/Base/Controller/FCommonPay.cs
@@ -513,6 +513,10 @@ namespace NP.Base.Controllers
         {
             var rtn = new Hashtable() { };
             var h = Dao.Get<Pay>("pay.pay", new Hashtable() { { "payno", payno }, { "userno", SUserInfo.UserNo },{"pstatus",1 },{ "rstatusnot",2} }).FirstOrDefault();
+            if(h == null)
+            {
+                return JsonBack(new JsonRtn() { code = -1 });
+            }
             rtn.Add("h", h);
             if (h != null)
             {
@@ -569,7 +573,25 @@ namespace NP.Base.Controllers
             return JsonOK(Dao.Save("pay.payrfdcancel.up", p));
         }
 
-
+        [HttpPost]
+        public JsonResult ShowPayTax(Int64 payno)
+        {
+            var rtn = new Hashtable() { };
+            var PayTaxes = Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno",payno } });
+            if(PayTaxes.Count() < 1)
+            {
+                return JsonBack(new JsonRtn() { code = -1 });
+            }
+            var paytax = Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno", payno } }).FirstOrDefault();
+            rtn.Add("paytax", paytax);
+            IList<File> filelist = new List<File>() { };
+            if (paytax.fgno != null)
+            {
+                filelist = GetFiles(paytax.fgno.Value);
+            }
+            rtn.Add("filelist", filelist);
+            return JsonBack(rtn);
+        }
     }
     
 }
\ No newline at end of file
diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache
index d4a7db7c717e070efb581d9a0377a113aae6222a..2e0f6850d104c354000a4dc54dfc1e1b6c7b5a20 100644
GIT binary patch
literal 48897
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
MsR_4Dn7DfX0zeczod5s;

literal 8781
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

diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 3f2c010..2bbceac 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1363,10 +1363,11 @@
             ,c.tyear,c.tseq
             ,u.username,u.userid
             ,ass.asname
-            ,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey
+            ,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey,e.payoktime,e.rstatus
+            ,e2.pino,e2.payamt pipayamt,e2.itemname
             ,f.estart,f.eend
             ,cc.cname studyplacename
-            ,pt.taxno,pt.taxdate
+            ,pt.taxno,pt.taxdate taxdate2
             ,a.cdt
             ,row_number() over(order by a.cdt desc) rno
             ,count(a.lectno) over() pagetotalcount
@@ -1374,6 +1375,18 @@
           inner join cm b on b.cmno = a.cmno
           inner join term c on c.tmno = b.tmno
           inner join pay e on e.payno = a.payno
+          left outer join(
+              select c.payno,c.pino,c.payamt
+              		,case c.ptype when 0 then c0.cname when 2 then c2.bkname when 4 then c0.cname when 3 then c3.exname else '-' end itemname
+              from lect a
+              inner join pay b on b.payno = a.payno
+              left outer join payitem c on c.payno = b.payno
+              left outer join cm c0 on c.ptype in (0,1,4) and c0.cmno=c.itemno
+              left outer join book c2 on c.ptype=2 and c2.bkno=c.itemno
+              left outer join exam c3 on c.ptype=3 and c3.exno=c.itemno
+              where a.status=1 and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull>
+              group by a.payno
+          ) e2 on e2.payno = e.payno
           left outer join users u on u.userno = a.userno
           left outer join assign ass on ass.asno = u.asno
           left outer join cminningscd f on f.cmisno = a.cmisno 
diff --git a/Dao/MyBatis/SqlMapStaging.config b/Dao/MyBatis/SqlMapStaging.config
index 9814afe..427143b 100644
--- a/Dao/MyBatis/SqlMapStaging.config
+++ b/Dao/MyBatis/SqlMapStaging.config
@@ -12,7 +12,7 @@
     <database>
         <provider name="MySql" />
         <!--테스트서버-->
-        <dataSource name="mysqlcon" connectionString="Server=218.232.111.111;Database=lmsynicte;User ID=ynicteadmin;password=dev1@#" />
+        <dataSource name="mysqlcon" connectionString="Server=218.232.111.111; Port=3306;Database=lmsynicte;User ID=ynicteadmin;password=dev1@#" />
     </database>
 
 
diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache
index 5e4fe9c262547dafe3aafdb16133dc9bd2be1a42..3fa2a6e513962677b9ec8041adea04d3ba480d49 100644
GIT binary patch
literal 26345
zcmeI53w#vSy~lTwoz0%*5s*g#9|SM>B5o2wUKF$;;i-v0Py_<$WHXzL+3YT}8z6i>
zR%(@7N?UL5RpPx;OKYvt-iqETwo)HxEwopyqW2>GXhp5}+Sb<ETeZDdy}#d_oy}}!
za|7B>t)I@}Gr!E7Ip@D;&iS6loS8HD6ra!c9vuJDjVyqyZ!#igB9(}y!}EKMSVwrJ
zmg-K08xp2oT5_3gri?^<UPV>7B3vFWFD+^4jiq}{eO_GeO`BS*v}9Rtd(4Pjr1z~%
zbnEeX?d6rxs%TBLqN1a!T&vVn{@AqqztPf{O6xr>X)UcYl!zKJ-8w2fO`bw3Vlh3E
zMiNrt#agN>t+mH=rdkw2{FMJUXaE617bmoig<2$?FpDzRGXlwNNc1E%Q#XUO+hT0d
z{qRf$F4JPYddlZ3^r`BI;KWQiE-^cdxE9OCd2M;^g|sdFkRtA=6ngpTHAFmK<%l+;
zGmgw{&{DcjQN}PLw*bvlG|p*Fnpd>0ZeG%`azX0~J*t~}Jff#sm(17FMygp)ha0uD
z)}$qqx*6_>#R5S@JA24zO?@pJVpbF@ut4DRhYURM8@SM(MBIuJLX??9M#%)cIMLZ@
z#5=7BBM{-d+z3sH4n5Y|Zp2#~_4eM**5+kl%ZuU1Fw?Bu8;Kn;iZYr~Oc?`Fd1B_U
z2+dq*<HMXR>`8R^v2_<{aes%NOa)TJE2Wz0jk;M7jkBZzicbVf2U~9G0v8?O`cz8q
zX^-_aYd!jc&1pT(nn3o#Clg`qIz~|_x2)N<s(910L5uaV@DQg^#z6w(A)$@4P{*pu
zYi8B>ROZ9UTr-Pl*lSj!ant~RG`^%G5barJCZd^KC{&ccP)3Z-)Tm5NWWJP+-hXK}
zUnamqOr(4a5|{)DZJdpKsVuLos8hsb`c8q23O6rUxzI%6Y)Y8jfm7k-QwR=edG~9F
z227p?4{<u>3`k%q#F^C!L1Ux?Z|xa~R00n%jdCU=@ORwX$TqODro76hlFPr5;_1Go
z{M%38l)-j7^I-<%EJ)yNNKWybL*H{Dxy2(`JSv$#soKW+p>}Dh`euI|1znKrE=+c(
z3sHg9XiV!&6-AQ0ni=V0n1&?<5u*q@UG=d}fgo06oeoCO_Ozp|E$Y_$lA2+vTB;>&
z78$7)R_qXCCVT5)L>N6iy;cVkH1!@fupK_7sEB=xudq-lV6`n!3JL}h91JSKs%&=^
zj~bo5CYoxro|y*3&{Otq-(s1(glVL^dgh*JtV~^z7i6>>F(cilC{~-I1ZE;x;|E&q
zf!;xs;*2<-5{5AO)^-(k{7+#R@cvRw8$}!0OSZN7g8r>A_9Tpbu#3sD$zKRmK<e0H
z&nYV_Yn)StUa?H}ie&@6Vp+cHW~UMg%tHKC`A$0qHR0+oTHN8sG<ru(ZAC|2G*Vet
z9jT6JFdZr)n^uOh1NNU3)@<}dC1p0Hic(Ffq1009D03iV**(xHY#CXDl)%TKp@E)V
z%*C;oN4bFK?TrPk96;Hyu>D(c@DO%bSXK_#<8;}uIXv()GGFH-R`Y=8KyFrtE6{nJ
zNOnf5s%vYak=ok2>bl76*&VPLDq@pwC7m7F`^e4)L=%ma1(b!9MU=&qC6uL<izpXE
z#<G8*^Rr7CRH-?J3$!(9S0qgQF)&^Wv{|EL(Y8Y0XmBLJs6jXe<?w}timZK4VRs|T
zsR?^y1{joMCD9CDaS3G^B)7Eo!a%mP?!ZB|v|13hYS_{m{A04rRw8c8;8O!7SMh=B
z0XtUfDmdzT9|d<QqKV5Wt0<RKR#Vnc)<VXz+on@WATn!Pu{Sz*@F~{8Ppqf3L71_0
zid7AEJ2Unx&WvqGn95-@HutAwwnh+hdF}~krgAWM0*#9nEw8PeRo7lSJ6c{jt5%26
zP|-A~bp`Bw-bbdgP6?V47~%QGo(Z8-r$bJvsrvAH-~v|<JgBaI*d1^u@-%4Q(S$@7
z4ut`svud{m;7%uiH#h-|A>6F|09rRmWw>uDv+kS9>|c@m^&sMfwwIGUaCai)#d~A?
z?NHGS=m(*VZJ|g|l8~_+8PX}|K-joitttNEsx4Q{k;!gs1wH`j-|F*SkAnbPP#mvl
zsjpxZ1^*sNUs17pe&LbF-{_ij{f~AmEj@JO|2)2Y)D!0)xPS7*{&)Jm@oM9?d;jRa
zYr?Kgkry5~y(x8<kyw5BJ1Yy;Pq}+q<J$Y*`?m!m`B-@Wm*!ry^XPwXi>>(dJs*F1
zQMypS|CQ!>jZ^+*`z^PMSn|gGi`MSztG=mq`^~Q^=gqIJ(hjbFdbWA%!6%A2d}0S*
z@axT|f8~*#Km4)6u@o<gMH}E5Y;+?xK$^2dI_K;OZ(mNRMA~a=v?_Fu6?K)f_43*}
zm4k$jYJDvzVAlARzn%f}-AcB22Bwu3>2cjOBG&X$i=O^u#oDzebAMl2GC1^~cm8bM
zI&#IFR01Y6*prGR%$U(05-A*tG{knYtJ{G(#xVqamCs?v9z%pe99xM^5S0T@53E?{
zpXW~OqYl<)(BK-VhD0B6*#fbh1ngQTVAr?-yAr`w-qd)2d4S25>r<d%M5giO3`IzA
zP$afOY$w^e%E{KJ+-!XY!ByTXdu(}ZNw%&54dd`MB^}eljeVFWG$NSU-rN@w*W!%W
z2C<!Ftk22VW;bKo5nSa|jK`SAm}Km8pdplLzb@~Ig~Sech|fc8C(%kd(K6j=U5DT*
zC-^+HJhUWQ{{R{S60MN<5)Q;aLTo3o>TzNfb7OS_f~$294=WEViPcWfV7FMSblffW
z!$aH%v7JP#(}`Bpjn+*FuJS>Ihn9zyL~9pl7@wU<aXj%1i7(@nxEW$Q37O`E?2~TD
zzKY<*e2TRj+pv>@M^pFjnYy93bo06OXZ0_w-@UD2;?*18YJ2GT+-KVKFYKQB{oB?Y
z{6yzdU)*y1jfGckS-$Jo^c~|i^ndJ}Q}2HMnb(d?xqQ^S;*=L2F-Dv|{osrJYv2CO
z(a}rqY96!fj9<SUdGHVaT5`z^t-B^X{FCMf^~kfcM#OJ_>X)@e?G^RE|L&BRL$S|x
zU+`k_JfzZ^6nwPnszck2A2cZ!z=xB9oDk$Bi;9g-<zp$Y=6E$n)|{__2FC>6EjSck
zhuBWmmbK2>vc_FoZbNXj5#oX6fhEDZ9W-PIk$Z3;z6r6N#OhKfRx90DeH+2m1rQG_
z4=ah)9iYK}+S+JpoA8QfNbH5DxD#SKiPt4gyqev3eFwqSg%A%f4=;(=-Jl_NR`?$H
zh<y;-Nw$_a*;?#o>w5^U@@*fFEsrh9)_tI1T;?WarK!bJSOCCf1R=2>XT<j*wv&uC
zI2oJoX6!)(R~JJ(#yrL(V-JCbf#oNT8{zPhcq*;oHB@l`LBzul+ez5wIboaYhV4-V
zSNYPS2b%|*gzbl*!Jg2w9zh(0hd2bWokXj~iB`26t$#;wbt%L{%R@_|^%!UvVnXk6
zoDxq!Y$qYBa6(q@hU_T>SNW>72bl+%gzPYA7@HZ8HED6JQ}5B^>5zCD{^A*k?Id9{
zorIm|ChQ1;s~1B&!aTwxVb6jF`*xDcmqX$xe8f*7wv%klaI!Vs&DQe>Ufc}XjcwS+
z5g+<H%3MogJ&wq}qs)aRd>k?O9c7h^ExZcjRTx=eenxNx-Y0$mhvFE-cCxlib=H<M
z+_mLp1XsC$#{<g)OM>-t(2)O?yjO5W{1?P_lCjB7#wNKL`vrols~{d@9%GWRUxJ40
zBd=fKK)eRAoy2OK6RT6)SiO$m>g5m*D-SD))o(#V&NRy#@DRU)*iND~%8AxUH(GBZ
zxVjqRq2-|^(RvFs*!L%L5yac@5r2T#PO??xWGmoi>o|g|Yakw59$S*FcR<7B%<Rg7
zcv?4;rjgQHbaSJDuSbQ%pKxBh3$dLfO>vUO^|^!A3M#mRRJjJ<Bh4dClE&}g3^7?;
zh*QGPNr#M+kR5;5u^{z-aWDw7BE%?OhbX(T4LjZPMpJ+Kn<IY`OkHXmo_y=1^gHvL
zZmU_pWciB^TwfnMyyft=35(YR$FKSE(S6g89hthhzhwEZzR~+q;p>0A_v|tE?Ax&?
zx%aupU#oueu^-$~{=1#$PN=-_zWZ)eemWyjc=b!loipy;f9CB~53GJ{&p*BNvmbr;
z;U^Z=?&}Yx%Wp|1pZx4U|NWhNulrW<dZf~tZrK~W`lf4sJL`)|8+`2P7G{#|)DG-<
zHOH$tvgYu^Z;t5}!P*jX)s{D%wdMEj+A<0;RNVv1`p%cPe4F0|7!4${x5CB5YK#l3
z*PU4X#*NiDVionU@~{E}vb`D)Byw(rClIZPF0_8(MC(;IT9Xl@xC>_K3KRos_m-Ad
zM$|ZVyx!95EhT+ZK#ilfJeBO7=3?(<Cwnis*_(<OYQh7{Yu3Pk1giu{<W9p(BU@*>
z*m~Z{)^l#QW{|C<$Ck%dmaVgZM0O;0HnBR#h1C%!R{!b7Y9?Y7^V?3=P3FB@S}&VC
z``C7cA9`Z9Nr;_J-Grl$<_Cxhk#hT!>_L1;QGSoTK}%{8eBl<~fD5`lv7G1I+;&7}
zOpqVTq7$W=d@t_9QSRFjTi|04Kmypeb5yw!2h2^n0R#L}O>R+ag-^bsP(FhbZUfia
z20n4+lUu*gc>FnKTgCv>$W6sYr)-C~4e(<Vxhde6C-SD?y1WMXS%F*w{Ki0D1N@YL
zI|co=fjcj3yK3xzgytw*NuJjL7mT|NeA#8-=AjIHHLn4#mCU^aE}Ucv{MejM;rd8-
z3iiM^*8rEu<u$;SaBc&8Z3Edn;3BBJ2DsMAZGekga#O&SE_n@nFRuZvT*x)RWej-@
zaJ7Ov1qW;c*-LnMC<Bk?HNba{b5n3=C<A=Y*qs8tPih&+rhqS(=Dh^IL+Uob*9CJ8
z@ZG_@29D%4aMU)CZCUw(SY89q=QY6BWODQ1SjK?ekl@gA3SW(JU&1T!wG3q21HKT!
z6u8<0zW3lZz^C20Dd3}T8gQk6Pq^I%_)Ig`03UGXHNfYXZUb+-4DcydUITns<u>pq
z+d!5BKAgyFfX^V@1~}JjT|(9XC!X^f;QX@N0H@z_^MG@4G=M*r`}s)uSK*YK+W;q8
zat(0SC9eTauDA{Gb~@Jp@2&G1;4QS<0Pl%%4e$nu23&0-?}OY1IPlFiz)^5s103wS
z4RDB)Yk=dOyaqU|aT!qAO`l9BkKn#Z5v=1fI&^b|p4QAx2>w%;h4}vf<bSiFjQBr^
C;XNDx

delta 798
zcmZuvO-mb56wRH?Oy|8MPNUd3S}`j0QwL>&*o`98(1q1PL=cLYYD!BDfha9?<JzU%
zjgVFMr6@wXsNgSfVWCB^i?+K;{R8bHy=T%i5k2tEynElh=YB9h59v?O&J1aaL?X%*
zit;>7*f8xY{LBbq;fo`-<?y@c>D2E}i%zO??1X-WG!2R&BQB(0X8a*P7z&2(kxIbZ
zB9!o_Cug(ee6jGVRDNN*;)+;`cY}|7(6W8!s+i97BmZG(xv-*DQcTr~7y$~=hLCwy
ztycMsH^Nz`&HM!;>5g&5X{C1Fc1P(NAGr@m^V`I@my!h40rG^BXb&(G?8PRAZMjN*
z2p81=gHRGJqhvGUoxGULQEG2Dh#GU9@?^*%yGz(9t}d0zE6<;3bzMx=EmTL?HvNz?
zXdPbqE*G?p5?Y6=OUu>j2({-M+P&h9<zBC@6^j1-{90bCKJlo2p*m{vUz_DmF3R7K
zaLWtjHyZLc#cS8(wYnvSx?Pu*Z%z42v-0PQ$^#PVVrcvx#)tLCb6)1#CSe2EB7Uc4
zSm~&kOl|LZYati*f@d}OFUZA!=cO?1Wm1Hp(sF=?0OmL^fT1oG7{Dsha)AE|7J9kM
Ly=Fh}KOOuFGH8)J

diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml
index f6d092b..16e6d57 100644
--- a/FO/Views/My/Document.cshtml
+++ b/FO/Views/My/Document.cshtml
@@ -84,7 +84,7 @@
                     }
                 </td>
                 <td class="ltaBtn" data-th="계산서/영수증 : ">
-                    @if (item.pstatus == 1)
+                    @if (item.pstatus == 1 && item.rstatus == 0)
                     {
                         if (item.ptype == 6)
                         {
@@ -92,21 +92,29 @@
                         }
                         else if (item.ptype == 1 && item.ispg == 1)
                         {
-                            <a href="#">[카드사 매출전표]</a>
+                            <a href="#" onclick="javascript:viewtax(@(item.pgkey))">[영수증]</a>
                         }
                         else if (item.ptype == 3 && item.ispg == 1)
                         {
-                            <a href="#">[서마터빌]</a>
+                            //일단대체?
+                            <a href="#" onclick="javascript:viewtax(@(item.pgkey))">[영수증]</a>
                         }
                         else
                         {
                             if (item.taxno > 0)
                             {
-                                <a href="#">[@(item.taxdate == null ? "신청중" : "발행")]</a>
+                                <a href="#" onclick="showtax(@(item.payno))">[@(item.taxdate2 == null ? "신청중" : "발행")]</a>
                             }
                             else
                             {
-                                <a href="#">[요청]</a>
+                                if (Convert.ToDateTime(Convert.ToDateTime(item.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-dd")))
+                                {
+                                    <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}",item.payamt.ToString("#,0")+"원",item.payoktime.ToString("yy-MM-dd"),item.ptypename2,item.ispg == 1 ? "PG" : "현장결제",item.itemname,item.pipayamt.ToString("#,0")+"원",item.pino))')">[요청]</a>
+                                }
+                                else
+                                {
+                                    <a href="#" onclick="alert('계산서 요청 기한이 지나 신청이 불가능합니다.'); return;">[요청]</a>
+                                }
                             }
                         }
                     }
@@ -119,6 +127,150 @@
         }
     </tbody>
 </table>
+<div class="mpgPop mpgPopFull" style="display:none;" id="pop1">
+    <div>
+        <div>
+            <div class="mpgPopWrap wdth650">
+                <div class="mpgPopTitle"><h5>계산서발행요청</h5><a href="#" onclick="javascript:mpgPopClose();"></a></div>
+                <div class="mpgPopScroll">
+                    <div class="odrPop pop1box">
+                        <h4 class="bskTitle">상품선택</h4>
+                        <table class="odrTable th150">
+                            <tr><th>총결제액/입금일</th><td id="mpttxt1"></td></tr>
+                            <tr><th>결제방법</th><td id="mpttxt2"></td></tr>
+                            <tr>
+                                <th>신청강좌</th>
+                                <td id="mpttxt3"></td>
+                            </tr>
+                            <tr>
+                                <th>발행요청금액</th>
+                                <td id="mpttxt4"></td>
+                            </tr>
+                            <tr>
+                                <th>청구구분</th>
+                                <td>
+                                    <input type="hidden" name="isreceipt" id="isreceipt" />
+                                    <ul class="bakRadio">
+                                        <li><input type="radio" name="isreceipts" id="isreceipt1" checked="checked" /><label for="isreceipt1">영수</label></li>
+                                        <li><input type="radio" name="isreceipts" id="isreceipt0" /><label for="isreceipts0">청구</label></li>
+                                    </ul>
+                                </td>
+                            </tr>
+                        </table>
+                        <form id="mform" method="post" enctype="multipart/form-data">
+                            <input type="hidden" id="pinos" name="pinos" value=""/>
+                            <input type="hidden" id="mptpayno" name="payno" value="" />
+                            <h4 class="bskTitle">발행업체 정보</h4>
+                            <table class="odrTable th150">
+                                <tr class="pd5"><th>회사명</th><td><input type="text" name="asname" id="asname" value="" /></td></tr>
+                                <tr class="pd5">
+                                    <th>대표자</th>
+                                    <td><input type="text" name="ceoname" id="ceoname" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>사업자등록번호</th>
+                                    <td><input type="text" name="brno" id="brno" value="" maxlength="12" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>법인등록번호</th>
+                                    <td><input type="text" name="grno" id="grno" value="" maxlength="14" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>업태</th>
+                                    <td><input type="text" name="btype" id="btype" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>종목</th>
+                                    <td><input type="text" name="bkind" id="bkind" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>담당자</th>
+                                    <td><input type="text" name="manname" id="manname" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>연락처</th>
+                                    <td><input type="text" name="telno" id="telno" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>이메일주소</th>
+                                    <td><input type="text" name="email" id="email" value="" /></td>
+                                </tr>
+                                <tr class="pd5" id="file">
+                                    <th>사업자등록증첨부</th>
+                                    <td><input type="file" name="file1" id="file1" value="" /></td>
+                                </tr>
+                                <tr class="pd5">
+                                    <th>기재사항</th>
+                                    <td><input type="text" name="taxinfo" id="taxinfo" value="" /></td>
+                                </tr>
+                            </table>
+                        </form>
+                        <ul class="odrPopBtn col1" id="paytaxbtn">
+                            <li><a href="#" onclick="save()" class="bk">계산서 발행요청</a></li>
+                        </ul>
+                    </div><!-- clsPopCont -->
+                </div>
+            </div><!-- clsPopWrap -->
+        </div>
+    </div>
+</div>
+<div class="mpgPop mpgPopFull" style="display:none;" id="pop2">
+    <div>
+        <div>
+            <div class="mpgPopWrap wdth650">
+                <div class="mpgPopTitle"><h5>계산서발행요청</h5><a href="#" onclick="javascript:mpgPopClose();"></a></div>
+                <div class="mpgPopScroll">
+                    <div class="odrPop pop2box">
+                        <h4 class="bskTitle">발행업체 정보</h4>
+                        <table class="odrTable th150">
+                            <tr class="pd5"><th>회사명</th><td><input type="text" name="tasname" id="tasname" disabled value="" /></td></tr>
+                            <tr class="pd5">
+                                <th>대표자</th>
+                                <td><input type="text" name="tceoname" id="tceoname" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>사업자등록번호</th>
+                                <td><input type="text" name="tbrno" id="tbrno" disabled value="" maxlength="12" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>법인등록번호</th>
+                                <td><input type="text" name="tgrno" id="tgrno" disabled value="" maxlength="14" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>업태</th>
+                                <td><input type="text" name="tbtype" id="tbtype" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>종목</th>
+                                <td><input type="text" name="tbkind" id="tbkind" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>담당자</th>
+                                <td><input type="text" name="tmanname" id="tmanname" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>연락처</th>
+                                <td><input type="text" name="ttelno" id="ttelno" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>이메일주소</th>
+                                <td><input type="text" name="temail" id="temail" disabled value="" /></td>
+                            </tr>
+                            <tr class="pd5" id="file">
+                                <th>사업자등록증첨부</th>
+                                <td id="tfile"></td>
+                            </tr>
+                            <tr class="pd5">
+                                <th>기재사항</th>
+                                <td><input type="text" name="ttaxinfo" id="ttaxinfo" disabled value="" /></td>
+                            </tr>
+                        </table>
+                    </div><!-- clsPopCont -->
+                </div>
+            </div><!-- clsPopWrap -->
+        </div>
+    </div>
+</div>
 @Html.Pager2((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 @section scripts{
     <script>
@@ -143,6 +295,124 @@
         function viewtax(pgkey) {
             showReceiptByTID('@(ViewBag.mid)', pgkey, @(ViewBag.mid)+pakey+@(ViewBag.mertkey));
         }
+        function calltax(payno, datas) {
+            if (datas != null) {
+                $("#mpttxt1").text(datas.split(':')[0] + " (" + datas.split(':')[1] + ")");
+                $("#mpttxt2").text(datas.split(':')[2] + " (" + datas.split(':')[3] + ")");
+                $("#mpttxt3").text(datas.split(':')[4]);
+                $("#mpttxt4").text(datas.split(':')[5]);
+                $("#pinos").val(datas.split(':')[6])
+                $("#mptpayno").val(payno);
+                capp("/fcommon/paytaxget", { payno: payno}, "cbpaytaxget");
+            } else {
+                $("#mpttxt1").text("");
+                $("#mpttxt2").text("");
+                $("#mpttxt3").text("");
+                $("#mpttxt4").text("");
+                $("#pinos").val("")
+                $("#mptpayno").val("");
+                msg("결제완료내역만 계산서요청하실 수 있습니다.");
+            }
+        }
+        function cbpaytaxget() {
+            var h = capResult.obj.h;
+            var d = capResult.obj.d;
+            if (h != null && d.length > 0) {
+                setv("asname", h.asname);
+                setv("ceoname", h.ceoname);
+                setv("brno", h.brno);
+                setv("grno", h.grno);
+                setv("btype", h.btype);
+                setv("bkind", h.bkind);
+                setv("manname", h.manname);
+                setv("telno", h.telno);
+                setv("email", h.email);
+                $('html, body').addClass('lock');
+                $("#pop1").fadeIn("fast", function () {
+                    $(".pop1box").scrollTop(0);
+                });
+            } else {
+                msg("이미 계산서를 접수중이거나 환불된 결제건입니다.");
+            }
+        }
+        function save() {
+            if (check("asname", null, "회사명을 입력해주세요.")) { }
+            else if (check("ceoname", null, "대표자명을 입력해주세요.")) { }
+            else if (check("brno", null, "사업자등록번호를 입력해주세요.")) { }
+            else if (check("grno", null, "법인등록번호를 입력해주세요.")) { }
+            else if (check("btype", null, "업태를 입력해주세요.")) { }
+            else if (check("bkind", null, "종목을 입력해주세요.")) { }
+            else if (check("manname", null, "담당자를 입력해주세요.")) { }
+            else if (check("telno", null, "연락처를 입력해주세요.")) { }
+            else if (check("email", null, "이메일주소를 입력해주세요.")) { }
+            else if (!isemail(val("email"))) { msg("이메일 형식이 올바르지 않습니다. 다시 입력해주세요."); }
+            else {
+                setv("isreceipt", $("#isreceipt1").prop("checked") ? 1 : 0);
+                confirmtoggle(true, "계산서발행요청 이후, 수정 및 철회는 고객문의 게시판을 이용해주십시오. 계산서 발행 요청을 완료하시겠습니까?", "gogo()");
+            }
+        }
+        function gogo() {
+            capfileform('/fcommon/paytaxsave', 'mform', 'cbgogo');
+        }
+        function cbgogo() {
+            if (capResult.code == 1000) {
+                msg("접수되었습니다.");
+                setTimeout(function () {
+                    $("#mform").attr("action", "/My/Document").submit()
+                }, 1000);
+            } else if (capResult.code == -1) {
+                msg("이미 신청된 계산서가 존재합니다.");
+            }
+        }
+        function showtax(payno) {
+            $("#tasname").val("");
+            $("#tceoname").val("");
+            $("#tbrno").val("");
+            $("#tgrno").val("");
+            $("#tbtype").val("");
+            $("#tbkind").val("");
+            $("#tmanname").val("");
+            $("#ttelno").val("");
+            $("#temail").val("");
+            $("#ttaxinfo").val("");
+            $("#tfile").html("");
+            capp('/fcommon/showpaytax', { payno: payno }, "cbshowtax");
+        }
+        function cbshowtax() {
+            var paytax = capResult.obj.paytax;
+            var filelist = capResult.obj.filelist;
+            if (capResult.code == 1000) {
+                if (paytax != null) {
+                    $("#tasname").val(paytax.asname);
+                    $("#tceoname").val(paytax.ceoname);
+                    $("#tbrno").val(paytax.brno);
+                    $("#tgrno").val(paytax.grno);
+                    $("#tbtype").val(paytax.btype);
+                    $("#tbkind").val(paytax.bkind);
+                    $("#tmanname").val(paytax.manname);
+                    $("#ttelno").val(paytax.telno);
+                    $("#temail").val(paytax.email);
+                    $("#ttaxinfo").val(paytax.taxinfo);
+                    $('html, body').addClass('lock');
+
+                    if (filelist.length > 0) {
+                        var file = "";
+                        $.each(filelist, function (i, d) {
+                            file += "<a href=\"/focommon/downfile?fno=" + d.fileno + "\">" + d.orgname + "</a><br/>";
+                        });
+                        $("#tfile").html(file);
+                    }
+
+                    $("#pop2").fadeIn("fast", function () {
+                        $(".pop2box").scrollTop(0);
+                    });
+                } else {
+                    msg("신청된 계산서가 없습니다.");
+                }
+            } else {
+                msg("신청된 계산서가 없습니다.");
+            } 
+        }
     </script>
     @if (ViewBag.isPayTest == "1")
     {
diff --git a/Model/CM.cs b/Model/CM.cs
index a45c061..33ba04c 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -922,10 +922,17 @@ namespace NP.Model
         public int ptype { get; set; }
         public int ispg { get; set; }
         public String ptypename { get; set; }
+        public String ptypename2 {
+            get
+            {
+                return ptype == 1 ? "신용카드" : ptype == 2 ? "계좌이체" : ptype == 3 ? "가상계좌" : ptype == 4 ? "현금" : ptype == 5 ? "복합" : ptype == 6 ? "무료" : ptype == 9 ? "위탁" : "-";
+            }
+        }
         public int? pcno { get; set; }
         public String pcno2 { get; set; }
         public String pcname { get; set; }
         public int payamt { get; set; }
+        public int pipayamt { get; set; }
         public int payamtcash { get; set; }
         public int payamtcard { get; set; }
         public String payamt2 { get; set; }
@@ -1080,6 +1087,7 @@ namespace NP.Model
         public String studyplacename { get; set; }
         public int taxno { get; set; }
         public DateTime taxdate { get; set; }
+        public DateTime? taxdate2 { get; set; }
         public Int64 cmisno { get; set; }
         /// <summary>
         /// 기술인분류
@@ -1103,6 +1111,7 @@ namespace NP.Model
             }
         }
         public String pgkey { get; set; }
+        public String itemname { get; set; }
     }
     /// <summary>
     /// 자격검정시험