This commit is contained in:
hyunho 2020-12-24 05:37:26 +00:00
parent f07859b8f8
commit 41ce3f796b
5 changed files with 24 additions and 6 deletions

View File

@ -185,7 +185,8 @@ namespace NP.Base.Controllers
iscashrct = vm.ptype == 1 ? 0 : vm.iscashrct,
cashrcthp = vm.ptype == 1 ? null : vm.cashrcthp,
pplno = vm.pplno,
PIs = vm.PayItems
PIs = vm.PayItems,
isbill = vm.isbill
};
vm.PayItems.Add(new PayItem()
{
@ -405,7 +406,8 @@ namespace NP.Base.Controllers
iscashrct = vm.ptype == 1 ? 0 : vm.iscashrct,
cashrcthp = vm.ptype == 1 ? null : vm.cashrcthp,
pplno = vm.pplno,
PIs = vm.PayItems
PIs = vm.PayItems,
isbill = vm.isbill
};
if (vm.Pay.isdvr == 1)
{

View File

@ -238,9 +238,9 @@
</select>
<insert id="pay.pay.pgin" parameterClass="pay">
insert into pay(ptype,ispg,isgroup,isexam,userno,username,pstatus,rstatus
,refunding,paylimit,payoktime,pgkey,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,isdvr,iscashrct,cashrcthp,pplno,<include refid="sql.inc"></include>)
,refunding,paylimit,payoktime,pgkey,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,isdvr,iscashrct,cashrcthp,pplno,isbill,<include refid="sql.inc"></include>)
select #ptype#,#ispg#,#isgroup#,#isexam#,a.userno,a.username,case when #ptype# = 6 then 1 else 0 end,0
,#refunding#,#paylimit#,case when #ptype# = 6 then now() else #payoktime# end,#pgkey#,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#isdvr#,#iscashrct#,HEX(AES_ENCRYPT(#cashrcthp#, <include refid="sql.digest"></include>)),#pplno#,<include refid="sql.inv"></include>
,#refunding#,#paylimit#,case when #ptype# = 6 then now() else #payoktime# end,#pgkey#,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#isdvr#,#iscashrct#,HEX(AES_ENCRYPT(#cashrcthp#, <include refid="sql.digest"></include>)),#pplno#,#isbill#,<include refid="sql.inv"></include>
from users a
where a.userno=#userno#
<selectKey type="post" property="payno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey>

View File

@ -49,7 +49,7 @@
}
</ul>
<div id="cashbox" style="display:none">
<h4 class="clsTitle">현금영수증 발행여부</h4>
<h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4>
<ul class="apyRdo">
<li><input type="radio" name="iscashrct" id="pay0201" value="0"><label for="pay0201">미발행</label></li>
<li>
@ -68,6 +68,7 @@
</ul>
<span class="cashnot hide">)</span>
</li>
<li><input type="checkbox" name="isbill" id="pay0203"><label for="pay0203">계산서 발행</label></li>
</ul>
</div>
<ul class="clsBtn society">
@ -121,6 +122,14 @@
$(".cashnot").addClass("hide");
}
});
$("input[name='isbill']").on("change", function () {
if ($("#pay0203").prop("checked")) {
$("#pay0203").val(1);
}
else {
$("#pay0203").val(0);
}
});
});
function save() {
$("#cashrcthp").val("");
@ -133,9 +142,11 @@
msg("결제방법을 선택해주세요.");
} else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").length < 1) {
msg("현금영수증 발행여부를 선택해주세요.");
$("#pay0203").prop("checked", false);
} else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").val() == 1 && !ismobilenumber($("#cashrcthp").val())) {
msg("현금영수증 발행 핸드폰번호를 올바르게 입력해주세요.");
} else {
}
else {
cap("/fcommon/paystart", "mform", "cbsave");
}
}

View File

@ -215,6 +215,10 @@ namespace NP.Model
public int iscanceled { get; set; }
public int iscashrct { get; set; }
public String cashrcthp { get; set; }
/// <summary>
/// 계산서발행여부
/// </summary>
public int isbill { get; set; }
//public Xpay xpay { get; set; }
public String mid { get; set; }

View File

@ -59,6 +59,7 @@ namespace NP.Model
public PPLog PPLog { get; set; }
public int iscashrct { get; set; }
public String cashrcthp { get; set; }
public int isbill { get; set; }
public System.Collections.Hashtable payParams { get; set; }
public CM CM { get; set; }
}