diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index a3854f3..dcc5341 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -115,7 +115,7 @@
정회원 : @Html.TextBoxFor(m => m.CM.infee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })
- 비회원 : @Html.TextBoxFor(m => m.CM.outfee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })
+
비회원 : @Html.TextBoxFor(m => m.CM.outfee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })
정원 : @Html.TextBoxFor(m => m.CM.quota, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "6" })
@@ -309,8 +309,7 @@
$("#pcgno").on("change", function () {
$("#CM_cgno option:gt(0)").remove();
if ($(this).val() != "") {
- //capp("/acommon/cgget", { pcgno: $(this).val() }, "cbcgget")
- loadlegal($(this).val());
+ capp("/acommon/cgget", { pcgno: $(this).val() }, "cbcgget");
}
});
if ('@Model.CM.isrefund' == '0') {
@@ -329,12 +328,6 @@
});
function loadlegal(cgno) {
capp("/acommon/cgget", { cgno: cgno }, "renderlegal");
- //if ($("#pcgno option:checked").text() == "건설기술진흥법교육") {
- // $("#divLegalEdu").show();
- //}
- //else {
- // $("#divLegalEdu").hide();
- //}
}
function renderlegal() {
if (capResult.code == "1000") {
@@ -346,15 +339,16 @@
}
}
}
- @*function cbcgget() {
+ function cbcgget() {
binddatacheck("CM_cgno");
- if ($("#pcgno").val() == "@(Model.CGs.Where(w=>w.cgcode==ViewBag.OffCode).Select(w=>w.cgno).FirstOrDefault())") {
+ loadlegal($("#pcgno").val());
+ @*if ($("#pcgno").val() == "@(Model.CGs.Where(w=>w.cgcode==ViewBag.OffCode).Select(w=>w.cgno).FirstOrDefault())") {
$("#keyword").attr("style", "");
} else {
$("#keyword").attr("style", "display:none;");
$("#keyword").find("input").val("");
- }
- }*@
+ }*@
+ }
var viewidxname = '@(Model.viewidxname)';
function save() {
setv("CM_usernos", getliv("cmprdatabox"));
diff --git a/Base/Controller/ACommonCM.cs b/Base/Controller/ACommonCM.cs
index c6edcc7..9cedc9c 100644
--- a/Base/Controller/ACommonCM.cs
+++ b/Base/Controller/ACommonCM.cs
@@ -109,6 +109,7 @@ namespace NP.Base.Controllers
[ValidateInput(false)]
public JsonResult CMSave(VMCM vm)
{
+ vm.CM.outfee = vm.CM.infee; //영남은 비회원가격 없이 회원가격으로 통일 2020-11-16
if(vm.CM.ismaster == 0)
{
vm.CM.retime = Convert.ToDateTime(vm.CM.retimeymd + " 23:59:59");
diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index 9e82088..a8d29b0 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -661,6 +661,18 @@