This commit is contained in:
parent
42fc9645ce
commit
8ec6db8ee4
|
|
@ -770,18 +770,25 @@ namespace NP.BO.Controllers
|
|||
}
|
||||
public ActionResult taxdetail(VMCRoom vm)
|
||||
{
|
||||
if (vm.longval < 1)
|
||||
if (vm.longval < 1 && vm.intval < 0 )
|
||||
{
|
||||
return Redirect("/croom/tax");
|
||||
}
|
||||
vm.PayTaxes = Dao.Get<PayTax>("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval } });
|
||||
if (vm.intval > 0)
|
||||
vm.PayTaxes = Dao.Get<PayTax>("cr.paytaxes", new System.Collections.Hashtable() { { "payno", vm.intval } });
|
||||
else
|
||||
vm.PayTaxes = Dao.Get<PayTax>("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval }});
|
||||
vm.FileList = new List<File>() { };
|
||||
if (vm.PayTaxes.First().fgno != null)
|
||||
{
|
||||
vm.FileList = GetFiles(vm.PayTaxes.First().fgno.Value);
|
||||
}
|
||||
vm.PayTaxes2 = Dao.Get<PayTax>("cr.paytaxes2", vm.PayTaxes.First().payno);
|
||||
vm.PayTaxItem = Dao.Get<PayItem>("cr.paytaxitem", vm.longval);
|
||||
if (vm.intval > 0)
|
||||
vm.PayTaxItem = Dao.Get<PayItem>("cr.paytaxitem2", new System.Collections.Hashtable() { { "payno", vm.intval } });
|
||||
else
|
||||
vm.PayTaxItem = Dao.Get<PayItem>("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", vm.longval } });
|
||||
|
||||
return View(vm);
|
||||
}
|
||||
public ActionResult taxsmart(VMCRoom vm)
|
||||
|
|
|
|||
|
|
@ -149,6 +149,9 @@
|
|||
<form id="dform" method="post" action="">
|
||||
@Html.Partial("./Partial/dform", Model, new ViewDataDictionary { { "preform", 1 } })
|
||||
</form>
|
||||
<form id="taxform" method="post" action="/croom/taxdetail">
|
||||
<input type="hidden" id="intval" name="intval" />
|
||||
</form>
|
||||
@section styles{
|
||||
<style type="text/css">
|
||||
.piptype {
|
||||
|
|
@ -262,5 +265,11 @@
|
|||
winopen("/croom/payrefund?payno=" + payno, 'payview', 1200, screen.height - 200);
|
||||
}
|
||||
}
|
||||
function gotaxdetail(payno) {
|
||||
$("#intval").val(payno)
|
||||
setTimeout(function () {
|
||||
$("#taxform").submit();
|
||||
}, 500);
|
||||
}
|
||||
</script>
|
||||
}
|
||||
|
|
@ -106,6 +106,53 @@ else if (p.isunpay == 3)
|
|||
<th>LG유플러스 코드</th>
|
||||
<td>@(p.ispg == 0 ? "수동결제" : p.pgkey)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
계산서신청
|
||||
</th>
|
||||
<td>
|
||||
@if (p.taxno != null)
|
||||
{
|
||||
<a href="#" onclick="gotax(@p.payno)" class="link" style="color:blue">신청</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>-</span>
|
||||
}
|
||||
</td>
|
||||
<th>
|
||||
계산서발행
|
||||
</th>
|
||||
<td>
|
||||
@if (p.iscancel == null || p.taxdate == null)
|
||||
{
|
||||
<span>-</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
if (p.iscancel == 1)
|
||||
{
|
||||
<span>발행취소</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
if (p.taxdate == null)
|
||||
{
|
||||
<span>미발행</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>발행완료</span>
|
||||
}
|
||||
}
|
||||
}
|
||||
</td>
|
||||
<th>
|
||||
</th>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</section>
|
||||
<section class="panel panel-default">
|
||||
|
|
@ -222,6 +269,7 @@ else if (p.isunpay == 3)
|
|||
</form>
|
||||
<div style="padding: 5px 10px; text-align: right;"><a href="#" class="btn btn-primary" onclick="save();">저장</a></div>
|
||||
</section>
|
||||
|
||||
}
|
||||
<br /><br /><br />
|
||||
<div id="postlayer" class="daumpost">
|
||||
|
|
@ -358,5 +406,10 @@ else if (p.isunpay == 3)
|
|||
opener.searchthis();
|
||||
}
|
||||
}
|
||||
|
||||
function gotax(payno) {
|
||||
opener.gotaxdetail(payno);
|
||||
self.close();
|
||||
}
|
||||
</script>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -911,6 +911,7 @@
|
|||
,pd.dvrcode,pd.rcvname,pd.isdvr isdvr2,pd.codetime,pd.post post2,pd.address1 address12,pd.address2 address22,pd.dmemo
|
||||
,CAST(AES_DECRYPT(UNHEX(pd.telno), <include refid="sql.digest"></include>) AS char) telno2
|
||||
,CAST(AES_DECRYPT(UNHEX(pd.mobile), <include refid="sql.digest"></include>) AS char) mobile2
|
||||
,tax.iscancel, tax.taxdate, tax.taxno
|
||||
from pay p
|
||||
inner join users u on u.userno=p.userno
|
||||
left outer join payitem pi on pi.payno=p.payno and pi.ptype in (3,4)
|
||||
|
|
@ -918,6 +919,7 @@
|
|||
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
|
||||
left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
|
||||
left outer join paydvr pd on pd.payno=p.payno
|
||||
left outer join paytax tax on tax.payno = p.payno
|
||||
where p.payno=#payno#
|
||||
</select>
|
||||
<select id="cr.pay2" parameterClass="long" resultClass="payitem">
|
||||
|
|
@ -1286,6 +1288,21 @@
|
|||
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
|
||||
where a.taxno=#taxno#
|
||||
</select>
|
||||
<select id="cr.paytaxitem2" parameterClass="hashtable" resultClass="payitem">
|
||||
select case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end itemname,pi.payamt,pi.pcnt,pi.ptype
|
||||
,p.isgroup,p.payamt ppayamt,p.payoktime,p.ptype pptype
|
||||
from paytax a
|
||||
inner join paytaxitem b on b.taxno=a.taxno
|
||||
inner join payitem pi on pi.pino=b.pino
|
||||
inner join pay p on p.payno=pi.payno
|
||||
left outer join cm cm on pi.ptype in (0,1,4) and cm.cmno=pi.itemno
|
||||
left outer join book bk on pi.ptype=2 and bk.bkno=pi.itemno
|
||||
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
|
||||
<dynamic prepend="where">
|
||||
<isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull>
|
||||
<isNotNull property="taxno" prepend="and">a.taxno=#taxno#</isNotNull>
|
||||
</dynamic>
|
||||
</select>
|
||||
<select id="cr.paytaxes2" parameterClass="long" resultClass="paytax">
|
||||
select a.taxno,a.taxamt,a.taxdate
|
||||
from paytax a
|
||||
|
|
|
|||
|
|
@ -230,6 +230,15 @@ namespace NP.Model
|
|||
/// md5로 인증문자열 암호화(authdata): md5(인증문자열)
|
||||
/// </summary>
|
||||
public String authdata { get; set; }
|
||||
/// <summary>
|
||||
/// 계산서요청일
|
||||
/// </summary>
|
||||
public DateTime? taxdate { get; set; }
|
||||
/// <summary>
|
||||
/// 발행취소
|
||||
/// </summary>
|
||||
public int? iscancel { get; set; }
|
||||
public Int64? taxno { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue