Merge branch 'develop' into bin2107

src/main/webapp/WEB-INF/views/marketing/PlanCornerListForm.html

@@ -172,6 +172,7 @@
 		}
 	}
 
+	
 	// 코너 상품 조회
 	var fnConnerGoodsSearch = function() {
 		var actionUrl = '/marketing/planning/corner/goods/list';
@@ -438,7 +439,7 @@
 					,excelFileNm : result.excelFileNm
 					};
 		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/excelupload', jsonData, fnCornerSearch);
+		gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/excelupload', jsonData, fnConnerGoodsSearch);
 	}
 
 	var fnOpenGoodsPopup = function() {

src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -532,7 +532,7 @@
 						<th>노출여부<em class="required" title="필수"></em></th>
 						<td colspan="3">
 							<select name="openYn" required="required" data-valid-name="오픈여부">
-								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
+								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'N'" th:text="|${oneData.cdNm}|"></option>
 							</select>
 						</td>
 					</tr>
@@ -622,8 +622,8 @@
 						<th class="custJoinTr" colspan="1">신규회원여부<em class="required" title="필수"></em></th>
 						<td>
 							<select name="newCustYn" id="newCustYn" onchange="newCustYnChange(this)" required="required" data-valid-name="신규회원여부">
-								<option value="Y" selected="selected">Y</option>
-								<option value="N" >N</option>
+								<option value="Y" >Y</option>
+								<option value="N" selected="selected">N</option>
 							</select>
 						</td>
 						<th>댓글여부<em class="required" title="필수"></em></th>
@@ -855,7 +855,7 @@
 		$("#searchTxt").val("[" + result[0].planSq + "] " +result[0].planNm);
 		
 	}
-	
+
 	// 댓글여부에 입력창 추가
 	/* $('select[name=replyYn]').on('change', function() {
 		if($('select[name=replyYn]').val() == 'Y'){
@@ -887,15 +887,6 @@
 				}
 			}
 			
-			if(planInfo.newCustYn == 'Y'){
-				$('.custJoinDateTr').css('display' , '');
-				$('#custJoinStdt').attr('required' , true);
-				$('#custJoinEddt').attr('required' , true);
-			} else {
-				$('.custJoinDateTr').css('display' , 'none');
-				$('#custJoinStdt').attr('required' , false);
-				$('#custJoinEddt').attr('required' , false);
-			}
 			
 			if(planInfo.replyLoc == "D"){
 				$('#planUpdateForm input:radio[name=replyLoc]:radio[value="D"]').prop('checked', true);
@@ -1726,6 +1717,11 @@
 		gagaAgGrid.createGrid("gridAfPlanList", gridOptionsAfList);
 		gagaAgGrid.createGrid("gridAttendPlanList", gridOptionsAttendList);
 		
+		$('.custJoinDateTr').css('display' , 'none');
+		$('#custJoinStdt').attr('required' , false);
+		$('#custJoinEddt').attr('required' , false);
+		
+		
 		 if (mode =='U') {
 			 if(planInfo.newCustYn == 'Y'){
 				 $("#planUpdateForm input[name=custJoinStDay]").val(planInfo.custJoinStdt.split(' ')[0]);

src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -207,7 +207,7 @@
 															</td>                                                                                                                    
 														</tr>        
 														<tr>
-															<th>상품 링크</th>
+															<th>이미지 링크</th>
 															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aL">
 															</td>
 														</tr>
@@ -1688,7 +1688,7 @@
 			}else{
 				multiPlanFile.push($('#fileItemVal'+(i+1)).val());
 				multiPlanFile2.push($('#planTemplateForm input[name=fileLinkUrl'+(i+1)+']').val());
-				multiPlanFile3.push($('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:checked').val());
+				multiPlanFile3.push($('#planTemplateForm input:radio[name=fileLinkOpenGb'+(i+1)+']:checked').val());
 			}
 		}
 		

src/main/webapp/WEB-INF/views/marketing/SocialShoppingListForm.html

@@ -661,6 +661,7 @@
 			}
 		}
 		mcxDialog.alert('상품이 적용되었습니다.');
+		uifnPopupClose('popupGoods')
 		gridOptionsGoods.api.setRowData(oldGoodsList);
 	}
 	

src/main/webapp/WEB-INF/views/order/OrderSellerDelvListForm.html

@@ -48,14 +48,14 @@ var columnDefs = [
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:70, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:80, cellClass: 'text-center', hide: true},
-	{headerName: "브랜드",				field:"brandKnm",			width:80, cellClass: 'text-center'},
+	{headerName: "브랜드",			field:"brandKnm",			width:80, cellClass: 'text-center'},
 	{headerName: "주문번호",			field:"ordNo",				width:70, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-	{headerName: "상품명",				field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "옵션1",				field:"optCd1",				width:100, cellClass: 'text-center'},
-	{headerName: "옵션2",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "상품명",			field:"goodsNm",			width:300, cellClass: 'text-center'},
+	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "배송업체",			field:"shipCompCd",			width:120, cellClass: 'text-center'
 		, valueFormatter: function (params) {
 			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
@@ -67,33 +67,11 @@ var columnDefs = [
 	{headerName: "송장",				field:"invoiceNo",			width:120, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "출고수량",			field:"delvQty",			width:100, cellClass: 'text-center'},
-	{headerName: "미출고수량",		field:"cancelQty",			width:100, cellClass: 'text-center'
-		, editable 			: true
-		, cellEditor		: 'agRichSelectCellEditor'
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
-		, cellEditorParams	: function(params){
-			if(params.data.ordExchGb == "E") {
-				return {value : [0]};
-			} else {
-				var qtyList = new Array();
-				for(var i = 0 ; i <= params.data.ordQty ; i++) qtyList.push(i);
-				return {values: qtyList};
-			}
-		},
-		onCellValueChanged : function(params) {
-			if(params.data.cancelQty > -1) {
-				params.data.cnclRtnQty = params.data.cancelQty;
-				params.data.delvQty = params.data.ordQty - params.data.cancelQty;
-				gridOptions.api.refreshCells();
-			}
-		}
-	},
 	{headerName: "결품수량",			field: "cnclRtnQty",		width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "결제PG",				field: "pgGb",				width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "결제PG",			field: "pgGb",				width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "결제수단",			field: "payMeans",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "고객번호",			field: "custNo",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "주문고객명",			field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "주문고객명",		field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "환불계좌은행코드",	field: "bankCd",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "환불계좌예금주명",	field: "accountNm",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "환불계좌번호",		field: "accountNo",			width: 100, cellClass: 'text-center', hide: true}