diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index e5564ae..0847d9b 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -900,7 +900,7 @@ where payno=#payno# and isunpay=1; - select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation + select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation,a.cshape ,b.payno,b.pstatus ,a2.infee,a2.accommofee ,b.isbill @@ -929,7 +929,7 @@ where a.cmno=#cmno# and a.isready=1 and a.status=6 - select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation + select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation,a.cshape ,b.payno,b.pstatus from pay b inner join pplog a on a.pplno=b.pplno diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index d83dd8b..cff45da 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -91,31 +91,33 @@ 무료 } - - 현금영수증 / 계산서 발행여부 + + 현금영수증 / 계산서 발행여부 - 미발행 - - 현금영수증 발행 (핸드폰번호 : - - - - 선택 - 010 - - - - - - - - - - ) - - @if (!string.IsNullOrEmpty(Model.PPLog.asname)) + @if ((Model.PPLog.cshape != 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0)) + { + + 현금영수증 발행 (핸드폰번호 : + + + + 선택 + 010 + + + - + + - + + + ) + + } + @if ((Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0 && !String.IsNullOrEmpty(Model.PPLog.asname))) { 계산서 발행 - } - + } + 수강신청 @@ -163,6 +165,9 @@ $("#cashbox").hide(); if ($(this).val() == 3) { $("#cashbox").show(); + if ($("input[name='iscashrct']").length == 1) { + $("input[name='iscashrct']").click(); + } } }); $("input[name='iscashrct']").on("change", function () { @@ -190,7 +195,7 @@ if ($("input[name='ptype']:checked").length < 1) { msg("결제방법을 선택해주세요."); } else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").length < 1) { - msg("현금영수증 발행여부를 선택해주세요."); + msg("현금영수증 / 계산서 발행여부를 선택해주세요."); } else if ($("input[name='ptype']:checked").val() == 3 && $("input[name='iscashrct']:checked").val() == 1 && !ismobilenumber($("#cashrcthp").val())) { msg("현금영수증 발행 핸드폰번호를 올바르게 입력해주세요."); }