lms에서 현금영수증 선택, 토스에서 미발행 선택 건
payvbankin.cshrpgkey(LGD_CASHRECEIPTNUM 10 현금영수증승인번호) 값이 없을때 showCashReceipts -> showReceiptByTID(결제거래 영수증 출력) 호출하게 수정
This commit is contained in:
lch
parent
8874c72bf4
commit
990b79a85f
|
|
@ -601,7 +601,7 @@ namespace NP.Base.Controllers
|
|||
/// <param name="payno"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public JsonResult PayTaxinvoiceView(long payno)
|
||||
public JsonResult GetPayTaxinvoicePrintURL(long payno)
|
||||
{
|
||||
var payTax = Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno", payno } }).Where(w=> w.cno == SUserInfo.UserNo).FirstOrDefault();
|
||||
if (payTax != null)
|
||||
|
|
|
|||
|
|
@ -1515,8 +1515,9 @@
|
|||
,cc.ccode studyplace
|
||||
,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel
|
||||
,a.cdt
|
||||
,pv.cshrpgkey
|
||||
,row_number() over(order by a.cdt desc) rno
|
||||
,count(a.lectno) over() pagetotalcount
|
||||
,count(a.lectno) over() pagetotalcount
|
||||
from lect a
|
||||
inner join cm b on b.cmno = a.cmno
|
||||
inner join term c on c.tmno = b.tmno
|
||||
|
|
@ -1538,6 +1539,7 @@
|
|||
left outer join cminningscd f on f.cmisno = a.cmisno
|
||||
left outer join comcode cc on cc.ccode = b.studyplace
|
||||
left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0
|
||||
left outer join payvbankin pv on pv.payno = a.payno
|
||||
where a.status=1 and a.ischanged=0
|
||||
<isNotNull property="cdts">and a.cdt >= #cdts#</isNotNull>
|
||||
<isNotNull property="cdte">and a.cdt <= #cdte#</isNotNull>
|
||||
|
|
|
|||
|
|
@ -131,10 +131,10 @@
|
|||
<tr>
|
||||
<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 != 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;" />
|
||||
<input type="radio" name="isCompany" id="isCompany0" value="0" @(Model.Assign != null ? "" : "checked") style="padding-left:5px" /><label for="isCompany0"> 개인</label>
|
||||
<input type="radio" name="isCompany" id="isCompany1" value="1" @(Model.Assign.asno != 0 ? "checked" : "") /><label for="isCompany1"> 업체</label>
|
||||
<input type="hidden" name="asno" id="asno" value="@(Model.Assign.asno)">
|
||||
<input type="text" id="asname" name="asname" placeholder="" readonly="readonly" value="@(Model.Assign.asname)" style="background-color:#ddd;" />
|
||||
<input type="radio" name="isCompany" id="isCompany0" value="0" @(Model.Assign.asno != 0 ? "" : "checked") style="padding-left:5px" /><label for="isCompany0"> 개인</label>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -117,7 +117,14 @@
|
|||
{
|
||||
if (item.iscashrct == 1) /*현금영수증신청*/
|
||||
{
|
||||
<a href="#" onclick="viewtaxcash('@(item.payno)')">[인쇄]</a>
|
||||
if (!string.IsNullOrEmpty(item.cshrpgkey) && item.cshrpgkey != "0" ) /*세금계산서신청*/
|
||||
{
|
||||
<a href="#" onclick="viewtaxcash('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))', '@(item.payno)')">[인쇄]</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -394,7 +401,7 @@ else
|
|||
}
|
||||
@section scripts{
|
||||
@Html.Partial("./Partial/ScriptPost")
|
||||
<script>
|
||||
<script>
|
||||
function certification(lectno) {
|
||||
var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
|
||||
if (pop == null) {
|
||||
|
|
@ -429,7 +436,7 @@ else
|
|||
showCashReceipts('@(ViewBag.mid)', LGD_OID, seqno, 'CAS', service_type);
|
||||
}
|
||||
function viewtaxinvoice(payno) {
|
||||
capp('/fcommon/paytaxinvoiceview', { payno: payno }, 'cbviewtaxinvoice');
|
||||
capp('/fcommon/getpaytaxinvoiceprinturl', { payno: payno }, 'cbviewtaxinvoice');
|
||||
}
|
||||
function cbviewtaxinvoice() {
|
||||
if (capResult.code == 1000) {
|
||||
|
|
@ -464,7 +471,7 @@ else
|
|||
msg("결제완료내역만 계산서요청하실 수 있습니다.");
|
||||
}
|
||||
}
|
||||
function cbpaytaxget() {
|
||||
function cbpaytaxget() {
|
||||
var h = capResult.obj.h;
|
||||
var d = capResult.obj.d;
|
||||
if (h != null && d.length > 0) {
|
||||
|
|
@ -561,7 +568,7 @@ else
|
|||
});
|
||||
$("#tfile").html(file);
|
||||
}
|
||||
$("input:radio[name='tisreceipt']:radio[value='" + paytax.isreceipt + "']").prop('checked', true);
|
||||
$("input:radio[name='tisreceipt']:radio[value='" + paytax.isreceipt + "']").prop('checked', true);
|
||||
$("#pop2").fadeIn("fast", function () {
|
||||
$(".pop2box").scrollTop(0);
|
||||
});
|
||||
|
|
@ -578,7 +585,7 @@ else
|
|||
$("#dform").submit();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
@if (ViewBag.isPayTest == "1")
|
||||
{
|
||||
//테스트일 경우
|
||||
|
|
|
|||
|
|
@ -1205,7 +1205,10 @@ namespace NP.Model
|
|||
/// 발행취소 0:정상, 1:취소
|
||||
/// </summary>
|
||||
public int iscancel { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 현금영수증 발급 TID 가상계좌 채번시 현금영수증자동발급 설정을 한 거래건에한해 전달
|
||||
/// </summary>
|
||||
public String cshrpgkey { get; set; }
|
||||
}
|
||||
/// <summary>
|
||||
/// 자격검정시험
|
||||
|
|
|
|||
Loading…
Reference in New Issue