|
|
@@ -1031,10 +1031,13 @@
|
|
|
for(let i = 0; i < arr.length; i++) {
|
|
|
const currElem = arr[i];
|
|
|
for(let j = i+1; j < arr.length; j++) {
|
|
|
- if(currElem === arr[j]) {
|
|
|
- dupYn = true;
|
|
|
- break;
|
|
|
- }
|
|
|
+ if (currElem != "" && arr[j] != "") {
|
|
|
+ if(currElem === arr[j]) {
|
|
|
+ dupYn = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1060,6 +1063,9 @@
|
|
|
}else if (attendData[i].pntUsableDay == "") {
|
|
|
mcxDialog.alert('혜택(포인트/혜택) 유효기간 일수를 입력하세요.');
|
|
|
return false;
|
|
|
+ }else if(attendData[i].cpnYn == "N"){
|
|
|
+ mcxDialog.alert('혜택(포인트/혜택) 유효한 쿠폰ID를 입력하세요.');
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
if (attendData[i].benefitGb == 'P') {
|
|
|
@@ -1083,31 +1089,14 @@
|
|
|
else if (attendData[i].cpnId == "") {
|
|
|
mcxDialog.alert('혜택(쿠폰) 적용 쿠폰ID를 입력하세요.');
|
|
|
return false;
|
|
|
+ }else if(attendData[i].cpnYn == "N"){
|
|
|
+ mcxDialog.alert('혜택(쿠폰) 유효한 쿠폰ID를 입력하세요.');
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (attendData[i].benefitGb == 'A' || attendData[i].benefitGb == 'C') {
|
|
|
- var param = {cpnId : attendData[i].cpnId};
|
|
|
- var jsonData = JSON.stringify(param);
|
|
|
-
|
|
|
- gagajf.ajaxJsonSubmit('marketing/planning/attend/coupon', jsonData, function(result) {
|
|
|
- if (result.length < 1) {
|
|
|
- mcxDialog.alert('입력하신 쿠폰 ID ' + attendData[i].cpnId.addComma() + '은(는) 유효하지 않습니다.');
|
|
|
- return false;
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- };
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- gagajf.ajaxFormSubmit('/marketing/poll/list', formId, function(result) {
|
|
|
- if (result.length < 1) {
|
|
|
- mcxDialog.alert('입력하신 투표 일련번호가 존재 하지않습니다.');
|
|
|
- return false;
|
|
|
- }
|
|
|
- });
|
|
|
|
|
|
// 날짜 유효성 체크
|
|
|
var stDate = $(formId + ' input[name=startSearchDate]').val().replaceAll("-", "");
|
|
|
@@ -1632,8 +1621,8 @@
|
|
|
{headerName: "혜택", field: "benefit", width: 110, cellClass: 'text-center',
|
|
|
cellEditor: 'agRichSelectCellEditor',cellEditorParams: { values: ['포인트', '쿠폰', '포인트/쿠폰'] },
|
|
|
},
|
|
|
- {headerName: "", field: "benefitGb", width: 50, cellClass: 'text-center', hide:true
|
|
|
- },
|
|
|
+ {headerName: "", field: "benefitGb", width: 50, cellClass: 'text-center', hide:true },
|
|
|
+ {headerName: "", field: "cpnYn", width: 50, cellClass: 'text-center', hide:true },
|
|
|
{headerName: "일수", field: "basDays", width: 50, cellClass: 'text-center', cellEditor: 'numericCellEditor'},
|
|
|
{headerName: "포인트", field: "pntAmt", width: 80, cellClass: 'text-center', cellEditor: 'numericCellEditor'
|
|
|
,cellEditorParams: { maxlength: 3, required: true }
|
|
|
@@ -1680,7 +1669,7 @@
|
|
|
return;
|
|
|
} else {
|
|
|
|
|
|
- var data = { benefit: '포인트',benefitGb: 'P', basDays:'' ,pntAmt:'', cpnId: '', pntUsableDay:''};
|
|
|
+ var data = { benefit: '포인트',benefitGb: 'P', cpnYn:'Y', basDays:'' ,pntAmt:'', cpnId: '', pntUsableDay:''};
|
|
|
gagaAgGrid.addRowData(gridOptionsAttendList, data);
|
|
|
}
|
|
|
|
|
|
@@ -1698,32 +1687,46 @@
|
|
|
|
|
|
if (event.colDef.field == "benefit"){
|
|
|
if (event.data.benefit == "쿠폰"){
|
|
|
-
|
|
|
gridOptionsAttendList.api.forEachNode(function(rowNode, index) {
|
|
|
if (rowNode.data.benefit == "쿠폰"){
|
|
|
- event.data.benefitGb = "C"
|
|
|
- gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
+ event.data.benefitGb = "C";
|
|
|
+ gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
return;
|
|
|
}
|
|
|
});
|
|
|
}else if(event.data.benefit == "포인트"){
|
|
|
gridOptionsAttendList.api.forEachNode(function(rowNode, index) {
|
|
|
if (rowNode.data.benefit == "포인트"){
|
|
|
- event.data.benefitGb = "P"
|
|
|
- gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
+ event.data.benefitGb = "P";
|
|
|
+ gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
return;
|
|
|
}
|
|
|
});
|
|
|
}else{
|
|
|
gridOptionsAttendList.api.forEachNode(function(rowNode, index) {
|
|
|
if (rowNode.data.benefit == "포인트/쿠폰"){
|
|
|
- event.data.benefitGb = "A"
|
|
|
- gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
+ event.data.benefitGb = "A";
|
|
|
+ gridOptionsAttendList.api.updateRowData({update: [event.data]});
|
|
|
return;
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (event.colDef.field == "cpnId"){
|
|
|
+ var param = {cpnId : event.data.cpnId};
|
|
|
+ var jsonData = JSON.stringify(param);
|
|
|
+
|
|
|
+ gagajf.ajaxJsonSubmit('marketing/planning/attend/coupon', jsonData, function(result) {
|
|
|
+ if (result.length < 1) {
|
|
|
+ mcxDialog.alert('입력하신 쿠폰 ID ' + event.data.cpnId + '은(는) 유효하지 않습니다.');
|
|
|
+ event.data.cpnYn = "N";
|
|
|
+ return false;
|
|
|
+ }else{
|
|
|
+ event.data.cpnYn = "Y";
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
$(document).ready(function() {
|
card007